diff --git a/cli/medperf/account_management/account_management.py b/cli/medperf/account_management/account_management.py
index 7511906ad..d19cf8cad 100644
--- a/cli/medperf/account_management/account_management.py
+++ b/cli/medperf/account_management/account_management.py
@@ -7,7 +7,7 @@
 def read_user_account():
     config_p = read_config()
     if config.credentials_keyword not in config_p.active_profile:
-        raise MedperfException("You are not logged in")
+        return
 
     account_info = config_p.active_profile[config.credentials_keyword]
     return account_info
@@ -35,6 +35,8 @@ def set_credentials(
 
 def read_credentials():
     account_info = read_user_account()
+    if account_info is None:
+        raise MedperfException("You are not logged in")
     email = account_info["email"]
     access_token, refresh_token = TokenStore().read_tokens(email)
 
diff --git a/cli/medperf/account_management/token_storage/filesystem.py b/cli/medperf/account_management/token_storage/filesystem.py
index 7450982b5..3d12960b4 100644
--- a/cli/medperf/account_management/token_storage/filesystem.py
+++ b/cli/medperf/account_management/token_storage/filesystem.py
@@ -28,14 +28,18 @@ def __get_paths(self, account_id):
 
     def set_tokens(self, account_id, access_token, refresh_token):
         access_token_file, refresh_token_file = self.__get_paths(account_id)
-        logging.debug("Writing tokens to disk.")
-        fd = os.open(access_token_file, os.O_CREAT | os.O_WRONLY, 0o600)
-        os.write(fd, access_token.encode("utf-8"))
-        os.close(fd)
-
-        fd = os.open(refresh_token_file, os.O_CREAT | os.O_WRONLY, 0o600)
-        os.write(fd, refresh_token.encode("utf-8"))
-        os.close(fd)
+
+        with open(access_token_file, "w") as f:
+            pass
+        os.chmod(access_token_file, 0o600)
+        with open(access_token_file, "a") as f:
+            f.write(access_token)
+
+        with open(refresh_token_file, "w") as f:
+            pass
+        os.chmod(refresh_token_file, 0o600)
+        with open(refresh_token_file, "a") as f:
+            f.write(refresh_token)
 
     def read_tokens(self, account_id):
         access_token_file, refresh_token_file = self.__get_paths(account_id)
diff --git a/cli/medperf/commands/auth/login.py b/cli/medperf/commands/auth/login.py
index 4cfc6d480..6aac5fe5f 100644
--- a/cli/medperf/commands/auth/login.py
+++ b/cli/medperf/commands/auth/login.py
@@ -1,13 +1,24 @@
 import medperf.config as config
-from medperf.exceptions import InvalidArgumentError
+from medperf.account_management import read_user_account
+from medperf.exceptions import InvalidArgumentError, MedperfException
 from email_validator import validate_email, EmailNotValidError
 
 
+def raise_if_logged_in():
+    account_info = read_user_account()
+    if account_info is not None:
+        raise MedperfException(
+            f"You are already logged in as {account_info['email']}."
+            " Logout before logging in again"
+        )
+
+
 class Login:
     @staticmethod
     def run(email: str = None):
         """Authenticate to be able to access the MedPerf server. A verification link will
         be provided and should be open in a browser to complete the login process."""
+        raise_if_logged_in()
         if not email:
             email = config.ui.prompt("Please type your email: ")
         try:
diff --git a/cli/medperf/commands/auth/status.py b/cli/medperf/commands/auth/status.py
index d1d10fca4..af0cda0c1 100644
--- a/cli/medperf/commands/auth/status.py
+++ b/cli/medperf/commands/auth/status.py
@@ -1,17 +1,14 @@
 import medperf.config as config
 from medperf.account_management import read_user_account
-from medperf.exceptions import MedperfException
 
 
 class Status:
     @staticmethod
     def run():
         """Shows the currently logged in user."""
-        try:
-            account_info = read_user_account()
-        except MedperfException as e:
-            # TODO: create a specific exception about unauthenticated client
-            config.ui.print(str(e))
+        account_info = read_user_account()
+        if account_info is None:
+            config.ui.print("You are not logged in")
             return
 
         email = account_info["email"]