diff --git a/evennia/commands/default/unloggedin.py b/evennia/commands/default/unloggedin.py
index 6a18c97745..93d6f129f4 100644
--- a/evennia/commands/default/unloggedin.py
+++ b/evennia/commands/default/unloggedin.py
@@ -20,14 +20,6 @@ __all__ = ("CmdUnconnectedConnect", "CmdUnconnectedCreate",
 
 MULTISESSION_MODE = settings.MULTISESSION_MODE
 CONNECTION_SCREEN_MODULE = settings.CONNECTION_SCREEN_MODULE
-CONNECTION_SCREEN = ""
-try:
-    CONNECTION_SCREEN = ansi.parse_ansi(utils.random_string_from_module(CONNECTION_SCREEN_MODULE))
-except Exception:
-    pass
-if not CONNECTION_SCREEN:
-    CONNECTION_SCREEN = "\nEvennia: Error in CONNECTION_SCREEN MODULE (randomly picked connection screen variable is not a string). \nEnter 'help' for aid."
-
 
 class CmdUnconnectedConnect(MuxCommand):
     """
@@ -280,7 +272,10 @@ class CmdUnconnectedLook(MuxCommand):
 
     def func(self):
         "Show the connect screen."
-        self.caller.msg(CONNECTION_SCREEN)
+        connection_screen = ansi.parse_ansi(utils.random_string_from_module(CONNECTION_SCREEN_MODULE))
+        if not connection_screen:
+            connection_screen = "No connection screen found. Please contact an admin."
+        self.caller.msg(connection_screen)
 
 
 class CmdUnconnectedHelp(MuxCommand):
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 7993524f03..5a194afa4a 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -213,7 +213,7 @@ SEARCH_AT_MULTIMATCH_INPUT = "evennia.commands.cmdparser.at_multimatch_input"
 # The module holding text strings for the connection screen.
 # This module should contain one or more variables
 # with strings defining the look of the screen.
-CONNECTION_SCREEN_MODULE = "world.connection_screen"
+CONNECTION_SCREEN_MODULE = "server.conf.connection_screens"
 # An optional module that, if existing, must hold a function
 # named at_initial_setup(). This hook method can be used to customize
 # the server's initial setup sequence (the very first startup of the system).