diff --git a/ShiftOS.WinForms/HackerCommands.cs b/ShiftOS.WinForms/HackerCommands.cs
index e2c4d12..107343b 100644
--- a/ShiftOS.WinForms/HackerCommands.cs
+++ b/ShiftOS.WinForms/HackerCommands.cs
@@ -158,8 +158,7 @@ namespace ShiftOS.WinForms
                     int tutPos = 0;
                     Action ondec = () =>
                     {
-                        if (tutPos == 2)
-                            tutPos++;
+                        tutPos++;
                     };
                     TerminalBackend.CommandProcessed += (o, a) =>
                     {
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 12c371f..7e517c1 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -156,6 +156,8 @@ namespace ShiftOS.Engine
                 {
                     Console.WriteLine("{ERROR}: " + ex.Message);
                 }
+
+                TerminalBackend.PrefixEnabled = false;
                 return true;
             }
             catch (Exception ex)
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs
index 4d599cd..31b3129 100644
--- a/ShiftOS_TheReturn/ServerManager.cs
+++ b/ShiftOS_TheReturn/ServerManager.cs
@@ -125,6 +125,8 @@ namespace ShiftOS.Engine
                 {
                     thisGuid = new Guid(msg.Contents);
                     GUIDReceived?.Invoke(msg.Contents);
+                    TerminalBackend.PrefixEnabled = true;
+                    TerminalBackend.PrintPrompt();
                 }
                 else if(msg.Name == "allusers")
                 {
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index c7852f1..e4bad33 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -339,35 +339,38 @@ namespace ShiftOS.Engine
 
         public static void PrintPrompt()
         {
-            ConsoleEx.BackgroundColor = SkinEngine.LoadedSkin.TerminalBackColorCC;
-            ConsoleEx.Italic = false;
-            ConsoleEx.Underline = false;
+            if (SaveSystem.CurrentSave != null)
+            {
+                ConsoleEx.BackgroundColor = SkinEngine.LoadedSkin.TerminalBackColorCC;
+                ConsoleEx.Italic = false;
+                ConsoleEx.Underline = false;
 
-            ConsoleEx.ForegroundColor = ConsoleColor.Magenta;
-            ConsoleEx.Bold = true;
+                ConsoleEx.ForegroundColor = ConsoleColor.Magenta;
+                ConsoleEx.Bold = true;
 
-            Console.Write(SaveSystem.CurrentSave.Username);
-            ConsoleEx.Bold = false;
-            ConsoleEx.ForegroundColor = ConsoleColor.Gray;
-            Console.Write("@");
-            ConsoleEx.Italic = true;
-            ConsoleEx.Bold = true;
-            ConsoleEx.ForegroundColor = ConsoleColor.Yellow;
-            Console.Write(SaveSystem.CurrentSave.SystemName);
-            ConsoleEx.Italic = false;
-            ConsoleEx.Bold = false;
-            ConsoleEx.ForegroundColor = ConsoleColor.Gray;
-            Console.Write(":~");
-            Console.ForegroundColor = ConsoleColor.White;
-            ConsoleEx.Italic = true;
-            if (KernelWatchdog.InKernelMode == true)
-                Console.Write("#");
-            else
-                Console.Write("$");
-            ConsoleEx.Italic = false;
-            ConsoleEx.Bold = false;
-            ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
-            Console.Write(" ");
+                Console.Write(SaveSystem.CurrentSave.Username);
+                ConsoleEx.Bold = false;
+                ConsoleEx.ForegroundColor = ConsoleColor.Gray;
+                Console.Write("@");
+                ConsoleEx.Italic = true;
+                ConsoleEx.Bold = true;
+                ConsoleEx.ForegroundColor = ConsoleColor.Yellow;
+                Console.Write(SaveSystem.CurrentSave.SystemName);
+                ConsoleEx.Italic = false;
+                ConsoleEx.Bold = false;
+                ConsoleEx.ForegroundColor = ConsoleColor.Gray;
+                Console.Write(":~");
+                Console.ForegroundColor = ConsoleColor.White;
+                ConsoleEx.Italic = true;
+                if (KernelWatchdog.InKernelMode == true)
+                    Console.Write("#");
+                else
+                    Console.Write("$");
+                ConsoleEx.Italic = false;
+                ConsoleEx.Bold = false;
+                ConsoleEx.ForegroundColor = SkinEngine.LoadedSkin.TerminalForeColorCC;
+                Console.Write(" ");
+            }
         }