diff --git a/flask_website/templates/404.html b/flask_website/templates/404.html
index 9f1a90f3..10381eb2 100644
--- a/flask_website/templates/404.html
+++ b/flask_website/templates/404.html
@@ -8,7 +8,7 @@ body, html {
 }
 
 body {
-  background: url(/static/ship.png) no-repeat center right;
+  background: url({{ url_for('.static', filename='ship.png') }}) no-repeat center right;
 }
 
 body:after {
@@ -18,7 +18,7 @@ body:after {
   top: 0;
   bottom: 0;
   width: 30px;
-  background: url(/static/mask.png) repeat-y left;
+  background: url({{ url_for('.static', filename='mask.png') }}) repeat-y left;
 }
 
 a { color: #004B6B; }
diff --git a/flask_website/templates/extensions/layout.html b/flask_website/templates/extensions/layout.html
index bf9a95d1..a43161b4 100644
--- a/flask_website/templates/extensions/layout.html
+++ b/flask_website/templates/extensions/layout.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { background-image: url(/static/extensions.png); }
+    h1 { background-image: url({{ url_for('.static', filename='extensions.png') }}); }
   </style>
 {% endblock %}
 {% block body_title %}
diff --git a/flask_website/templates/general/change_openid.html b/flask_website/templates/general/change_openid.html
index add8d93f..aee2586f 100644
--- a/flask_website/templates/general/change_openid.html
+++ b/flask_website/templates/general/change_openid.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { background-image: url(/static/profile.png); }
+    h1 { background-image: url({{ url_for('.static', filename='profile.png') }}); }
   </style>
 {% endblock %}
 {% block title %}Change OpenID{% endblock %}
diff --git a/flask_website/templates/general/first_login.html b/flask_website/templates/general/first_login.html
index da7086dd..cf3d1d01 100644
--- a/flask_website/templates/general/first_login.html
+++ b/flask_website/templates/general/first_login.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { background-image: url(/static/login.png); }
+    h1 { background-image: url({{ url_for('.static', filename='login.png') }}); }
   </style>
 {% endblock %}
 {% block title %}First Login{% endblock %}
diff --git a/flask_website/templates/general/index.html b/flask_website/templates/general/index.html
index ebeb1796..8c2eae3e 100644
--- a/flask_website/templates/general/index.html
+++ b/flask_website/templates/general/index.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { margin: 0 0 30px 0; background: url(/static/logo.png) no-repeat center; height: 165px; }
+    h1 { margin: 0 0 30px 0; background: url({{ url_for('.static', filename='login.png') }}) no-repeat center; height: 165px; }
     h1 span, p.tagline { display: none; }
   </style>
   <link href="{{ tweets.feed_url }}" rel="alternate" title="Flask on Twitter" type="application/atom+xml">
diff --git a/flask_website/templates/general/login.html b/flask_website/templates/general/login.html
index 05c9119e..379949f3 100644
--- a/flask_website/templates/general/login.html
+++ b/flask_website/templates/general/login.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { background-image: url(/static/login.png); }
+    h1 { background-image: url({{ url_for('.static', filename='login.png') }}); }
   </style>
 {% endblock %}
 {% block title %}Login{% endblock %}
diff --git a/flask_website/templates/general/profile.html b/flask_website/templates/general/profile.html
index de752e04..6bc4d2ba 100644
--- a/flask_website/templates/general/profile.html
+++ b/flask_website/templates/general/profile.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { background-image: url(/static/profile.png); }
+    h1 { background-image: url({{ url_for('.static', filename='profile.png') }}); }
   </style>
 {% endblock %}
 {% block title %}Profile{% endblock %}
diff --git a/flask_website/templates/mailinglist/layout.html b/flask_website/templates/mailinglist/layout.html
index 844fb18c..179500dc 100644
--- a/flask_website/templates/mailinglist/layout.html
+++ b/flask_website/templates/mailinglist/layout.html
@@ -2,7 +2,7 @@
 {% block head %}
   {{ super() }}
   <style type=text/css>
-    h1 { background-image: url(/static/mailinglist.png); }
+    h1 { background-image: url({{ url_for('.static', filename='mailinglist.png') }}); }
   </style>
 {% endblock %}
 {% block body_title %}
diff --git a/flask_website/templates/snippets/layout.html b/flask_website/templates/snippets/layout.html
index 800c1cb9..fb137a1a 100644
--- a/flask_website/templates/snippets/layout.html
+++ b/flask_website/templates/snippets/layout.html
@@ -3,7 +3,7 @@
   {{ super() }}
   <link href="{{ url_for('recent_feed') }}" rel="alternate" title="Recent Flask Snippets" type="application/atom+xml">
   <style type=text/css>
-    h1 { background-image: url(/static/snippets.png); }
+    h1 { background-image: url({{ url_for('.static', filename='snippets.png') }}); }
   </style>
 {% endblock %}
 {% block body_title %}
diff --git a/flask_website/views/general.py b/flask_website/views/general.py
index 94ec05ee..d21c696c 100644
--- a/flask_website/views/general.py
+++ b/flask_website/views/general.py
@@ -32,7 +32,7 @@ def logout():
 def login():
     if g.user is not None:
         return redirect(url_for('general.index'))
-    if reassign and 'cancel' in request.form:
+    if 'cancel' in request.form:
         flash(u'Cancelled. The OpenID was not changed.')
         return redirect(oid.get_next_url())
     openid = request.values.get('openid')