--- a/client/src/translations.json	Fri Aug 24 15:35:32 2018 +0200
+++ b/client/src/translations.json	Fri Aug 24 15:46:38 2018 +0200
@@ -1,13 +1,13 @@
 {
   "en_GB": {
-    "Enter email": "Enter email",
+    "Enter username": "Enter username",
     "Enter passphrase": "Enter passphrase",
     "Login failed": "Login failed",
     "Login": "Login",
     "Forgot password": "Forgot password"
   },
   "de_AT": {
-    "Enter email": "Email",
+    "Enter username": "Benutzername",
     "Enter passphrase": "Passphrase",
     "Login failed": "Login fehlgeschlagen",
     "Login": "Login",

--- a/client/src/views/Login.vue	Fri Aug 24 15:35:32 2018 +0200
+++ b/client/src/views/Login.vue	Fri Aug 24 15:46:38 2018 +0200
@@ -11,8 +11,8 @@
            <div id="alert" v-if="loginFailed" class="loginerrormessage alert alert-danger" role="alert">
              <span class="loginerror"><translate>Login failed</translate></span>
            </div>
-        <div class="input-group mb-3 emailgroup">
-          <input type="text" v-model="user" id="inputEmail" class="form-control" :placeholder="emailLabel" required autofocus>
+        <div class="input-group mb-3 usernamegroup">
+          <input type="text" v-model="user" id="inputUsername" class="form-control" :placeholder="usernameLabel" required autofocus>
         </div>
         <div class="input-group mb-3 passwordgroup">
           <input :type="isPasswordVisible" v-model="password" id="inputPassword" class="form-control" :placeholder='passwordLabel' required>
@@ -28,8 +28,8 @@
     <div class="d-flex flex-row justify-content-center">
       <form class="loginform form-signin">
         <div v-if="showPasswordReset" class="small">TODO text and action for password reset
-          <div class="input-group mb-3 emailgroup">
-            <input type="text" v-model="emailToReset" class="form-control" :placeholder="emailLabel" required>
+          <div class="input-group mb-3 usernamegroup">
+            <input type="text" v-model="usernameToReset" class="form-control" :placeholder="usernameLabel" required>
           </div>
           <button class="btn btn-secondary btn-block" type="button"
             @click="togglePasswordReset"><translate>Send</translate></button>
@@ -51,7 +51,7 @@
 $logincollapsed: 470px;
 $loginextended: 550px;
 
-.emailgroup {
+.usernamegroup {
   box-shadow: $basic-shadow-light !important;
 }
 .forgottenlink {
@@ -127,15 +127,15 @@
       loginFailed: false,
       readablePassword: false,
       showPasswordReset: false,
-      emailToReset: ""
+      usernameToReset: ""
     };
   },
   computed: {
     passwordLabel() {
       return this.$gettext("Enter passphrase");
     },
-    emailLabel() {
-      return this.$gettext("Enter email");
+    usernameLabel() {
+      return this.$gettext("Enter username");
     },
     isPasswordVisible() {
       return this.readablePassword ? "text" : "password";