diff --git a/static/favicon.ico b/static/favicon.ico
index 2529c923f..a4777862b 100644
Binary files a/static/favicon.ico and b/static/favicon.ico differ
diff --git a/static/index.html b/static/index.html
index fb53acb20..3b3944cc2 100644
--- a/static/index.html
+++ b/static/index.html
@@ -89,18 +89,8 @@
         <link href="static/custom/index.css" rel="stylesheet"> 
         <script src="static/custom/index.js"></script>
 	<script>
-            function go2Name() 
-            {
-                var padname = document.getElementById("padname").value;
-                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
-            }
- 
-            function go2Random() 
-            {
-                window.location = /** "p/" + **/ randomPadName();
-            }
- 
-            function randomPadName() 
+
+	    function randomPadName() 
             {
                 var chars = "23456789ABCDEFGHJKLMNPQRSTUWXYZabcdefghijkmnopqrstuwxyz";
                 var string_length = 16;
@@ -112,7 +102,31 @@
                 }
                 return randomstring;
             }
-            
+
+            function go2Name() 
+            {
+                var padname = document.getElementById("padname").value;
+                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
+            }
+ 
+            function go2Random() 
+            {
+		var rnd = randomPadName();
+		var prefixedName = prompt( "You can prefix or modify your random pad name with some reasonable characters.\nSpecial characters will be removed or escaped.\n\n", "-"+rnd );
+		if ( prefixedName == "-" + rnd ) prefixedName = rnd;
+		var escPrefixedName = encodeURIComponent( prefixedName.replace( /\//, "" ) );
+		if ( prefixedName == null ) return;
+		if ( prefixedName == decodeURIComponent( escPrefixedName )
+		     || ( prefixedName != escPrefixedName 
+			&& confirm( "You have used characters which are not allowed in Urls, and the padname will therefore be modified to "
+			+ decodeURIComponent( escPrefixedName ) 
+			+ ".\nDo you want to use this modifed name?" ) ) ) {
+			window.location = /** "p/" + **/ escPrefixedName;
+		} else {
+			return;
+		}
+            }
+           
             //start the costum js
             if(typeof costumStart == "function") costumStart();
         </script> 
diff --git a/static/js/pad2.js b/static/js/pad2.js
index 9df57ae8f..ea06d8cfd 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -172,7 +172,7 @@ function handshake()
   socket.once('connect', function()
   {
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
-    padId = unescape(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
+    padId = decodeURIComponent(padId);
 
     document.title = document.title + " | " + padId;
 
diff --git a/static/timeslider.html b/static/timeslider.html
index 4dbf8d939..73bc5fcd1 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -62,7 +62,7 @@
     
     //get the padId out of the url 
     var urlParts= document.location.pathname.split("/");
-    padId = urlParts[urlParts.length-2];
+    padId = decodeURIComponent( urlParts[urlParts.length-2] );
         
     //set the title
     document.title = document.title + " | " + padId;