diff --git a/rsbbs/rsbbs.py b/rsbbs/rsbbs.py
index 9d32be3..abebb5f 100755
--- a/rsbbs/rsbbs.py
+++ b/rsbbs/rsbbs.py
@@ -44,7 +44,7 @@ def main():
     controller = Controller(config)
 
     # Init the user:
-    user = User(controller, args.calling_station.upper())
+    user = User(config, controller)
 
     # Init the UI console
     console = Console(config, controller, user)
diff --git a/rsbbs/user.py b/rsbbs/user.py
index 4329b07..b7df1e2 100644
--- a/rsbbs/user.py
+++ b/rsbbs/user.py
@@ -23,15 +23,15 @@ import sqlalchemy
 from datetime import datetime, timezone
 
 from rsbbs import __version__
-from rsbbs import Controller
+from rsbbs import Config, Controller
 
 from rsbbs.models import User as SAUser
 
 
 class User():
-    def __init__(self, controller: Controller, callsign: str):
+    def __init__(self, config: Config, controller: Controller):
         self.controller = controller
-        self.callsign = callsign
+        self.callsign = config.args.calling_station.upper()
         self.user = self.get_or_create_user()
 
     def __getattr__(self, __name: str) -> Any:
@@ -42,7 +42,7 @@ class User():
             session.expire_on_commit = False
             try:
                 statement = sqlalchemy.select(SAUser).where(
-                    SAUser.callsign == self.callsign.upper())
+                    SAUser.callsign == self.callsign)
                 exopts = {"prebuffer_rows": True}
                 result = session.execute(statement,
                                          execution_options=exopts)
@@ -57,7 +57,7 @@ class User():
                 else:
                     logging.info(f"User not found.")
                     user = SAUser(
-                        callsign=self.callsign.upper(),
+                        callsign=self.callsign,
                         login_count=1,
                     )
                     session.add(user)