diff --git a/backend/application.py b/backend/application.py
index decaf2428..8614dd026 100644
--- a/backend/application.py
+++ b/backend/application.py
@@ -575,6 +575,7 @@ def get(self):
         """
         if db.get_admin_datasets(self.current_user).count() <= 0:
             self.finish({'user':None, 'expires':None, 'password':None})
+            return
 
         password = None
         username = None
@@ -600,6 +601,7 @@ def post(self):
         """
         if db.get_admin_datasets(self.current_user).count() <= 0:
             self.finish({'user':None, 'expires':None, 'password':None})
+            return
 
         # Create a new password
         username = "_".join(self.current_user.name.split()) + "_sftp"