diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5093203..41df141 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Matemat Changelog
 
+<!-- BEGIN RELEASE v0.3.18 -->
+## Version 0.3.18
+
+Fix barcode error message
+
+### Changes
+
+<!-- BEGIN CHANGES 0.3.18 -->
+- fix: missing error message when scanning an unassociated barcode
+<!-- END CHANGES 0.3.18 -->
+
+<!-- END RELEASE v0.3.18 -->
+
 <!-- BEGIN RELEASE v0.3.17 -->
 ## Version 0.3.17
 
diff --git a/matemat/__init__.py b/matemat/__init__.py
index 1736e67..ad356f7 100644
--- a/matemat/__init__.py
+++ b/matemat/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.3.17'
+__version__ = '0.3.18'
diff --git a/matemat/webserver/pagelets/main.py b/matemat/webserver/pagelets/main.py
index 478a082..f5e7556 100644
--- a/matemat/webserver/pagelets/main.py
+++ b/matemat/webserver/pagelets/main.py
@@ -39,7 +39,7 @@ def main_page():
                         redirect('/')
                     except AuthenticationError:
                         # Redirect to main page on token login error
-                        redirect('/')
+                        pass
                 Notification.error(f'EAN code {request.params.ean} is not associated with any product.', decay=True)
                 redirect('/')
 
diff --git a/templates/admin.html b/templates/admin.html
index c55da8b..9c98991 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -25,15 +25,14 @@
 {% endblock %}
 
 {% block eanwebsocket %}
+  let tokeninput = document.getElementById("admin-newtoken-token");
+  tokeninput.value = e.data;
+  tokeninput.select();
 {% if authuser.is_admin %}
   let eaninput = document.getElementById("admin-newproduct-ean");
   eaninput.value = e.data;
   eaninput.select();
-  eaninput.scrollIntoView();
 {% else %}
-  let tokeninput = document.getElementById("admin-newtoken-token");
-  tokeninput.value = e.data;
-  tokeninput.select();
   tokeninput.scrollIntoView();
 {% endif %}
 {% endblock %}