diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json
index 0fa658c..91bafdf 100644
--- a/src/assets/translations/bo.json
+++ b/src/assets/translations/bo.json
@@ -47,7 +47,8 @@
         "password_required": "གསང་ཚིག་དགོས་ཀྱི་ཡོད།",
         "username_required": "སྤྱོད་མིང་དགོས་ཀྱི་ཡོད།",
         "create_room": "ཐོ་འགོད་དང་ཁ་བརྡ་ཁང་གསར་སྐྲུན།",
-        "or": "ཡང་ན།"
+        "or": "ཡང་ན།",
+        "invalid_message": ""
     },
     "new_room": {
         "next": "རྗེས་མ།",
diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json
index b182c64..f0ec7fd 100644
--- a/src/assets/translations/de.json
+++ b/src/assets/translations/de.json
@@ -110,7 +110,8 @@
         "password_required": "Das Passwort ist erforderlich",
         "login": "Anmelden",
         "create_room": "Registrieren und Raum erstellen",
-        "or": "ODER"
+        "or": "ODER",
+        "invalid_message": ""
     },
     "profile": {
         "title": "Mein Profil",
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index e9f60d1..a58777f 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -115,7 +115,8 @@
     "password_required": "Password is required",
     "login": "Login",
     "create_room": "Register & Create Room",
-    "or": "OR"
+    "or": "OR",
+    "invalid_message": "Invalid username or password"
   },
   "profile": {
     "title": "My Profile",
diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json
index 31278b9..8e7d9de 100644
--- a/src/assets/translations/es.json
+++ b/src/assets/translations/es.json
@@ -76,7 +76,8 @@
         "username": "Nombre de Usuario",
         "title": "Iniciar sesión",
         "create_room": "",
-        "or": ""
+        "or": "",
+        "invalid_message": ""
     },
     "device_list": {
         "not_verified": "No ha sido Verificado",
diff --git a/src/assets/translations/fi.json b/src/assets/translations/fi.json
index 1e4b4f0..79691d9 100644
--- a/src/assets/translations/fi.json
+++ b/src/assets/translations/fi.json
@@ -60,7 +60,8 @@
         "login": "Kirjaudu sisään",
         "password": "Anna salasana",
         "password_required": "Salasana vaaditaan",
-        "create_room": "Rekisteröidy ja luo huone"
+        "create_room": "Rekisteröidy ja luo huone",
+        "invalid_message": ""
     },
     "join": {
         "joining_as": "Liityt jäsenenä:",
diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json
index e19a604..4349670 100644
--- a/src/assets/translations/fr.json
+++ b/src/assets/translations/fr.json
@@ -110,7 +110,8 @@
         "password_required": "Le mot de passe est obligatoire",
         "create_room": "S’inscrire et créer un salon",
         "or": "OU",
-        "login": "Se connecter"
+        "login": "Se connecter",
+        "invalid_message": ""
     },
     "profile": {
         "temporary_identity": "Cette identité est temporaire. Définissez un mot de passe pour l’utiliser à nouveau",
diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json
index 4470c8b..9c53650 100644
--- a/src/assets/translations/it.json
+++ b/src/assets/translations/it.json
@@ -109,7 +109,8 @@
         "login": "Accedi",
         "create_room": "Registrati e crea una stanza",
         "or": "O",
-        "username_required": "Il nome utente è richiesto"
+        "username_required": "Il nome utente è richiesto",
+        "invalid_message": ""
     },
     "profile": {
         "title": "Il mio profilo",
diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json
index 0921857..afddc9b 100644
--- a/src/assets/translations/nb_NO.json
+++ b/src/assets/translations/nb_NO.json
@@ -102,7 +102,8 @@
         "password": "Passord",
         "username": "Brukernavn",
         "create_room": "",
-        "or": ""
+        "or": "",
+        "invalid_message": ""
     },
     "new_room": {
         "add_people": "Legg til folk",
diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json
index c2530dd..0077600 100644
--- a/src/assets/translations/pt_BR.json
+++ b/src/assets/translations/pt_BR.json
@@ -128,7 +128,8 @@
         "password_required": "A senha é obrigatória",
         "login": "Entrar",
         "create_room": "Cadastre-se e crie uma sala",
-        "or": "OU"
+        "or": "OU",
+        "invalid_message": ""
     },
     "profile": {
         "title": "Meu perfil",
diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json
index d167c07..4ab741e 100644
--- a/src/assets/translations/ro.json
+++ b/src/assets/translations/ro.json
@@ -135,7 +135,8 @@
         "username": "Nume utilizator (ex: marta)",
         "title": "Autentificare",
         "create_room": "",
-        "or": ""
+        "or": "",
+        "invalid_message": ""
     },
     "device_list": {
         "not_verified": "Nu a fost verificat",
diff --git a/src/assets/translations/si.json b/src/assets/translations/si.json
index deca16d..817bbdc 100644
--- a/src/assets/translations/si.json
+++ b/src/assets/translations/si.json
@@ -23,5 +23,8 @@
         "download_progress": "{percentage}% බාගත වී ඇත",
         "file_prefix": "ගොනුව: ",
         "you": "ඔබ"
+    },
+    "login": {
+        "invalid_message": ""
     }
 }
\ No newline at end of file
diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json
index c444844..7c78103 100644
--- a/src/assets/translations/ug.json
+++ b/src/assets/translations/ug.json
@@ -221,7 +221,8 @@
         "username": "قوللانغۇچى ئىسمى (مەسىلەن: marta)",
         "title": "كىرىش",
         "create_room": "",
-        "or": ""
+        "or": "",
+        "invalid_message": ""
     },
     "device_list": {
         "not_verified": "دەلىللەنمىدى",
diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json
index fb4d61c..e7f5dbe 100644
--- a/src/assets/translations/zh_Hans.json
+++ b/src/assets/translations/zh_Hans.json
@@ -50,7 +50,8 @@
         "username_required": "需要用户名",
         "username": "用户名 (如: marta)",
         "create_room": "",
-        "or": ""
+        "or": "",
+        "invalid_message": ""
     },
     "device_list": {
         "title": "设备",
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 07ea475..5184455 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -37,6 +37,7 @@
           :error-messages="userErrorMessage"
           required
           v-on:keyup.enter="$refs.password.focus()"
+          v-on:keydown="hasError=false"
         ></v-text-field>
         <v-text-field
           prepend-inner-icon="$vuetify.icons.password"
@@ -51,6 +52,7 @@
           :error="passErrorMessage != null"
           :error-messages="passErrorMessage"
           required
+          v-on:keydown="hasError=false"
           v-on:keyup.enter="
             () => {
               if (isValid && !loading) {
@@ -59,6 +61,7 @@
             }
           "
         ></v-text-field>
+        <div class="error--text" v-if="hasError">{{ this.message }}</div>
         <v-checkbox
           class="mt-0"
           v-model="rememberMe"
@@ -102,6 +105,7 @@ export default {
       message: "",
       userErrorMessage: null,
       passErrorMessage: null,
+      hasError: false
     };
   },
   computed: {
@@ -142,19 +146,7 @@ export default {
         this.passErrorMessage = null;
       },
       deep: true,
-    },
-    message() {
-      if (this.message && this.message.toLowerCase().includes("user")) {
-        this.userErrorMessage = this.message;
-      } else {
-        this.userErrorMessage = null;
-      }
-      if (this.message && this.message.toLowerCase().includes("pass")) {
-        this.passErrorMessage = this.message;
-      } else {
-        this.passErrorMessage = null;
-      }
-    },
+    }
   },
   methods: {
     handleLogin() {
@@ -189,6 +181,10 @@ export default {
               (error.data && error.data.error) ||
               error.message ||
               error.toString();
+            if(error.data.errcode ==='M_FORBIDDEN') {
+              this.message = this.$i18n.messages[this.$i18n.locale].login.invalid_message;
+              this.hasError = true;
+            }
             console.log("Message set to ", this.message);
           }
         );