diff --git a/CompetitionStorage.js b/CompetitionStorage.js
index 637efde9b..007d07253 100644
--- a/CompetitionStorage.js
+++ b/CompetitionStorage.js
@@ -145,6 +145,10 @@ function newCompetitionStorage(pName) {
 
             thisObject.competitorsSequences.push(fileSequences);
 
+            if (pCompetition.participants.length === 0) { //If there are no competitions, respond OK
+                callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE);
+            }
+
         } catch (err) {
 
             if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err = " + err); }
diff --git a/TopSpace/Login.js b/TopSpace/Login.js
index 5fe5bae86..a94fd7871 100644
--- a/TopSpace/Login.js
+++ b/TopSpace/Login.js
@@ -203,7 +203,7 @@ function newLogin() {
 
                 if (err.result !== GLOBAL.DEFAULT_OK_RESPONSE.result) {
 
-                    console.log("Authentication Error. " + err.message);
+                    console.log("Please make sure you create a new team!");
                     return;
 
                 }