diff --git a/src/components/LoginSystem.vue b/src/components/LoginSystem.vue
index ffdde5dde01bae25e38af90484814f93ff8ef9e2..24b4afbcd0a887a38ede8bfa2564ae333d9a6363 100644
--- a/src/components/LoginSystem.vue
+++ b/src/components/LoginSystem.vue
@@ -42,7 +42,7 @@
 			<form class="my-2 my-lg-0">
 
         <div class="form-floating mb-3">
-          <input id="username" type="text" class="form-control" v-model="username" @keyup.enter="handleLogin()"/>
+          <input id="username" type="text" class="form-control" v-model="username" @keyup.enter="handleLogin()" autocapitalize="none" />
           <label for="username">{{ this.$i18n.t("login.username.field.placeholder") }}</label>
         </div>
         <div class="form-floating mb-3">
@@ -50,22 +50,23 @@
           <label for="password">{{ this.$i18n.t("login.pwd.field.placeholder") }}</label>
         </div>
 
-				<div class="form-group mb-3 float-end">
+				<div class="form-group mb-3 justify-content-end">
           <router-link to="/RegisterUserForm" class="btn btn-warning" onclick="$('.offcanvas-collapse').toggleClass('open')">{{ $t("registeruser.button.label") }}</router-link>
           <button class="btn btn-primary ms-2" type="button" @click="handleLogin()" @keyup.enter="handleLogin()">
             {{ $t("login.button.label")}}
           </button>
         </div>
-				<div v-show="!showForgottenPasswordForm && !showForgottenPasswordSubmitSuccessMsg" class="form-group" @click="showForgottenPasswordForm=true; submitFailed=false; errorMessage=undefined;">
+				<div class="form-group mb-3 justify-content-end" v-show="!showForgottenPasswordForm && !showForgottenPasswordSubmitSuccessMsg" @click="showForgottenPasswordForm=true; submitFailed=false; errorMessage=undefined;">
           <a href="#" class="card-link">{{ $t("login.forgotpassword.label") }}</a>
         </div>
 				<div v-show="showForgottenPasswordForm" >
 					<h4>{{ $t("login.forgotpassword.label") }} <a href="#" @click.prevent="showForgottenPasswordForm=false">Lukk</a></h4>
-					{{ $t("login.forgotpassword.description")}}
-					<div class="form-group">
-						<input type="email" class="form-control" v-model="email" :placeholder="$t('login.forgotpassword.field.placeholder')"/>
+					<p>{{ $t("login.forgotpassword.description")}}</p>
+					<div class="form-floating mb-3">
+						<input id="email" type="email" class="form-control" v-model="email" :placeholder="$t('login.forgotpassword.field.placeholder')"/>
+            <label for="email">{{ $t('login.forgotpassword.field.placeholder') }}</label>
 					</div>
-					<div class="form-group">
+					<div class="form-group mb-3">
 						<button class="btn btn-primary" type="button" v-on:click="handleForgottenPassword()">
 							{{ $t("login.forgotpassword.button.label")}}
 						</button>