diff --git a/module/fid/config/username-change-form.php b/module/fid/config/username-change-form.php
index 75ac717b6a862512ecfb7193f0c4ddb59fafc102..9139e55b080c8b2780e32640170fd0c37ec3dc6a 100644
--- a/module/fid/config/username-change-form.php
+++ b/module/fid/config/username-change-form.php
@@ -46,7 +46,7 @@ return [
         'usernameConfirmation' => [
             'spec' => [
                 'name'       => 'usernameConfirmation',
-                'type'       => Text::class,
+                'type'       => Email::class,
                 'options'    => [
                     'label' => 'label_newusername_confirmation',
                 ],
diff --git a/themes/fid/templates/Auth/AbstractBase/loginfields.phtml b/themes/fid/templates/Auth/AbstractBase/loginfields.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..9001e9f97ed1bd1eb337474a8bf87b40e708ddc7
--- /dev/null
+++ b/themes/fid/templates/Auth/AbstractBase/loginfields.phtml
@@ -0,0 +1,8 @@
+<div class="form-group">
+  <label class="control-label" for="login_<?=$this->escapeHtmlAttr($topClass)?>_username"><?=$this->transEsc('Username')?>:</label>
+  <input type="email" name="username" id="login_<?=$this->escapeHtmlAttr($topClass)?>_username" value="<?=$this->escapeHtmlAttr($this->request->get('username'))?>" class="form-control"/>
+</div>
+<div class="form-group">
+  <label class="control-label" for="login_<?=$this->escapeHtmlAttr($topClass)?>_password"><?=$this->transEsc('Password')?>:</label>
+  <input type="password" name="password" id="login_<?=$this->escapeHtmlAttr($topClass)?>_password" class="form-control"/>
+</div>
\ No newline at end of file