diff --git a/mslib/mscolab/server.py b/mslib/mscolab/server.py
index 2ad5c857e..8bcd4763e 100644
--- a/mslib/mscolab/server.py
+++ b/mslib/mscolab/server.py
@@ -205,15 +205,13 @@ def home():
 # ToDo setup codes in return statements
 @APP.route("/status")
 def hello():
-    try:
-        if request.authorization.parameters["username"] == "mscolab":
-            @conditional_decorator(auth.login_required,
-                                   mscolab_settings.__dict__.get('enable_basic_http_authentication', False))
-            def hello2():
-                return "Mscolab server"
-    except AttributeError:
+    if request.authorization is not None:
+        if mscolab_settings.__dict__.get('enable_basic_http_authentication', False):
+            auth.login_required()
+            return "Mscolab server"
+        return "Mscolab server"
+    else:
         return "Mscolab server"
-    return "Mscolab server"
 
 
 @APP.route('/token', methods=["POST"])