diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 5f2f4041b5..6966211457 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -473,9 +473,11 @@ namespace OpenSim.Framework.Console
                             y = -1;
                         }
 
+                        string commandLine = cmdline.ToString();
+                        
                         if (isCommand)
                         {
-                            string[] cmd = Commands.Resolve(Parser.Parse(cmdline.ToString()));
+                            string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
 
                             if (cmd.Length != 0)
                             {
@@ -491,7 +493,10 @@ namespace OpenSim.Framework.Console
                             }
                         }
 
-                        //AddToHistory(cmdline.ToString());
+                        // If we're not echoing to screen (e.g. a password) then we probably don't want it in history
+                        if (echo && commandLine != "")
+                            AddToHistory(commandLine);
+                        
                         return cmdline.ToString();
                     default:
                         break;