diff --git a/src/Constants.js b/src/Constants.js
index 66fba7fbb..60d6b5356 100644
--- a/src/Constants.js
+++ b/src/Constants.js
@@ -1,5 +1,5 @@
 CONSTANTS = {
-    Version:                "0.19.4",
+    Version:                "0.19.5",
     
 	//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience
     //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then
diff --git a/src/Terminal.js b/src/Terminal.js
index ef97c3a1e..8bd7e00a9 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -827,28 +827,40 @@ var Terminal = {
                 }
                 var ip = server.ip;
                 
-                //Check that a script with this filename does not already exist
+                var currServ = Player.getCurrentServer();
+                
+                //Get the current script
+                var sourceScript = null;
+                for (var i = 0; i < currServ.scripts.length; ++i) {
+                    if (scriptname == currServ.scripts[i].filename) {
+                        sourceScript = currServ.scripts[i];
+                        break;
+                    }
+                }
+                if (sourceScript == null) {
+                    post("ERROR: scp() failed. No such script exists");
+                    return;
+                }
+                
+                //Overwrite script if it exists
                 for (var i = 0; i < server.scripts.length; ++i) {
                     if (scriptname == server.scripts[i].filename) {
-                        post(server.hostname + " already contains a script named " + scriptname);
+                        post("WARNING: " + scriptname + " already exists on " + server.hostname + " and will be overwritten");
+                        var oldScript = server.scripts[i];
+                        oldScript.code = sourceScript.code;
+                        oldScript.ramUsage = sourceScript.ramUsage;
+                        post(scriptname + " overwriten on " + server.hostname);
                         return;
                     }
                 }
                 
-                var currServ = Player.getCurrentServer();
-                for (var i = 0; i < currServ.scripts.length; ++i) {
-                    if (scriptname == currServ.scripts[i].filename) { 
-                        var newScript = new Script();
-                        newScript.filename = scriptname;
-                        newScript.code = currServ.scripts[i].code;
-                        newScript.ramUsage = currServ.scripts[i].ramUsage;
-                        newScript.server = ip;
-                        server.scripts.push(newScript);
-                        post(scriptname + " copied over to " + server.hostname);
-                        return;
-                    }
-                }
-                post("Script not found");
+                var newScript = new Script();
+                newScript.filename = scriptname;
+                newScript.code = sourceScript.code;
+                newScript.ramUsage = sourceScript.ramUsage;
+                newScript.server = ip;
+                server.scripts.push(newScript);
+                post(scriptname + " copied over to " + server.hostname);  
 				break;
             case "sudov":
                 if (commandArray.length != 1) {