diff --git a/panel_tools.py b/panel_tools.py
index 662f47356..cfc765bdc 100755
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -287,7 +287,10 @@ def show_panel_pwd():
 
 def show_panel_adminpath():
     admin_path = thisdb.getOption('admin_path')
-    print('/'+admin_path)
+    if admin_path == '':
+        print('/login')
+    else:
+        print('/'+admin_path)
 
 
 def set_panel_username(username=None):
diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py
index a769c1e0c..f18e8ca5b 100644
--- a/web/admin/dashboard/dashboard.py
+++ b/web/admin/dashboard/dashboard.py
@@ -28,7 +28,7 @@ import thisdb
 
 
 blueprint = Blueprint('dashboard', __name__, url_prefix='/', template_folder='../../templates')
-@blueprint.route('/')
+@blueprint.route('/', endpoint='index', methods=['GET'])
 @panel_login_required
 def index():
     name = thisdb.getOption('template', default='default')
diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py
index ef9cc9e5e..793ac2efe 100644
--- a/web/admin/dashboard/login.py
+++ b/web/admin/dashboard/login.py
@@ -102,8 +102,8 @@ def login():
         session['login'] = False
         session['overdue'] = 0
 
-    db_path = thisdb.getOption('admin_path')
-    if db_path == '':
+    admin_path = thisdb.getOption('admin_path')
+    if admin_path == '':
         return render_template('%s/login.html' % name)
     else:
         unauthorized_status = thisdb.getOption('unauthorized_status')