diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 8330bf089..6fd5bef52 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -41,7 +41,7 @@
   {% if issue %}
     <div class="row">
     <div class="col errorlink">Please report this issue with all related information:
-        <a href="https://github.com/janeczku/calibre-web/issues/new/choose=">{{_('Create Issue')}}</a>
+        <a href="https://github.com/janeczku/calibre-web/issues/new/choose">{{_('Create Issue')}}</a>
     </div>
       </div>
     {% endif %}
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 07adbabd6..1bee1c1d1 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -37,7 +37,7 @@
           <a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
         </div>
         {% if g.current_theme == 1 %}
-            <div class="home-btn"><a class="home-btn-tooltip" href="/" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
+            <div class="home-btn"><a class="home-btn-tooltip" href="{{url_for("web.index",page=1)}}" data-toggle="tooltip" title="" data-placement="bottom" data-original-title="Home"></a></div>
             <div class="plexBack"><a href="{{url_for('web.index')}}"></a></div>
         {% endif %}
         {% if current_user.is_authenticated or g.allow_anonymous %}