diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html
index c9b3a68..5f8bdc0 100644
--- a/dasettings/templates/dasettings/user_usprof.html
+++ b/dasettings/templates/dasettings/user_usprof.html
@@ -373,7 +373,7 @@ function updateNewMail(){
         {           
           if(data['success']){   
             $('#notchange_done').toast('show');     
-            $("#toast_savecontent").html("E-Mailadresse aktualisiert");
+            $("#toast_savecontent").html("E-Mailadresse aktualisiert");            
           }
           else{             
             $('#notchange_err').toast('show');
diff --git a/dasettings/views.py b/dasettings/views.py
index 922282e..53451a0 100644
--- a/dasettings/views.py
+++ b/dasettings/views.py
@@ -424,7 +424,11 @@ def SettingsProfilManagement(request, context):
 	if request.POST.get("form_type") == "userform":
 		userform = UsersSelfChangeForm(request.POST, instance=request.user)
 		if userform.is_valid():
+			usert = User.objects.get(pk=request.user.pk)			
 			userform.save()					
+			usert.username = userform.cleaned_data.get("email")			
+			usert.email = userform.cleaned_data.get("email")			
+			usert.save()
 			messages.success(request, f'E-Mailadresse aktualisiert!')
 			passwordform = PasswordChangeForm(request.user)
 			context['userform'] = userform			
@@ -717,6 +721,7 @@ def SettingsAjaxRouter(request):
 					success = False
 				else:
 					tempuser.email = newmail
+					tempuser.username = newmail
 					tempuser.save()
 					success = True
 			else:
diff --git a/users/templates/users/login.html b/users/templates/users/login.html
index af55a17..dc761a8 100644
--- a/users/templates/users/login.html
+++ b/users/templates/users/login.html
@@ -38,8 +38,9 @@
 </div>
 </div>
 <script type="text/javascript">
+	$("label[for*='username']").html("E-Mail-Adresse*");
 	$(document).ready(function(){
-		localStorage.clear();
+		localStorage.clear();		
 	})
 </script>
 {% endblock content %}
\ No newline at end of file