diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino
index bd4f3536..551d9008 100644
--- a/cubesatsim/cubesatsim.ino
+++ b/cubesatsim/cubesatsim.ino
@@ -4555,6 +4555,12 @@ void prompt_for_input() {
 	    strcpy(serial_string, pass);
 	    Serial.println("Connecting to Wifi");	
 	    WiFi.begin(ssid, pass);	
+		
+	    while (WiFi.status() != WL_CONNECTED) {
+    		Serial.print(".");
+    		delay(500);
+  	    }	
+		
 	} else 
 	    Serial.println("No password entered.");	
       } else