diff --git a/newurl.py b/newurl.py
index 2034fb65fe4be7aa14d6976aded7313289a1546d..130e5708c6adca83c9699b581e3071b495e7835f 100644
--- a/newurl.py
+++ b/newurl.py
@@ -17,7 +17,7 @@ def newurl(request, skipCaptcha, recaptchaPrivateKey, recaptchaPublicKey, buildd
         return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, snackbar="Please enter a url to short, before submitting this form", long_url_prefilled=request.form.get('url'), short_url_prefilled=request.form.get('short').lower(), domain_prefilled=domain_to_index[request.form.get('domain')], recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar, cookieNotice=cookieNotice) #return the user the prefilled form with an error message, because no url to short was provided
     if (request.form.get('short').replace(" ", "") == ""):
         return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, snackbar="Please enter a short name, before submitting this form", long_url_prefilled=request.form.get('url'), short_url_prefilled=request.form.get('short').lower(), domain_prefilled=domain_to_index[request.form.get('domain')], recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar, cookieNotice=cookieNotice) #return the user the prefilled form with an error message, because no short link was provided
-    shorturl = (request.form.get('domain') + "/" + request.form.get('short')).lower()
+    shorturl = (request.form.get('domain') + "/" + request.form.get('short').replace(" ", "_").replace("/", "")).lower()
 
     url = request.form.get('url')
     with connect('db/urls.db') as conn: #Check if another user already used the short link