diff --git a/app/templates/auth/login.html b/app/templates/auth/login.html
index b37e5712..cb6c2a91 100644
--- a/app/templates/auth/login.html
+++ b/app/templates/auth/login.html
@@ -1,4 +1,8 @@
-{% extends 'base.html' %}
+{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
+    {% extends 'themes/' + theme() + '/base.html' %}
+{% else %}
+    {% extends "base.html" %}
+{% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
diff --git a/app/templates/base.html b/app/templates/base.html
index df9183fe..37a58779 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -270,7 +270,7 @@
         <script type="text/javascript" src="{{ url_for('static', filename='js/markdown/downarea.js', changed=getmtime('js/markdown/downarea.js')) }}"></script>
     {% endif %}
     {% if theme() and file_exists('app/templates/themes/' + theme() + '/scripts.js') %}
-        <script src="{{ url_for('static', filename='themes/' + theme() + '/scripts.js') }}" />
+        <script src="{{ url_for('static', filename='themes/' + theme() + '/scripts.js') }}"></script>
     {% endif %}
     {% block end_scripts %}