diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs
index 72aaeb2..48ddf27 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs
@@ -20,15 +20,20 @@ public class User
 	[Required]
 	public string PasswordHash { get; private set; }
 
+	[Required]
+	public string Email { get; set; }
+
 	[Required]
 	public Role Role { get; set; }
 
+
 	public string? SessionToken { get; set; }
 
-	public User(string name, string passwordHash, Role role)
+	public User(string name, string passwordHash, string email, Role role)
 	{
 		Name = name;
 		PasswordHash = passwordHash;
+		Email = email;
 		Role = role;
 	}
 }
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor
index a0d6fe5..a92d666 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor
@@ -52,6 +52,8 @@
 											<Small>Name: @context.Item.Name</Small>
 											<br />
 											<Small>Rolle: @context.Item.Role</Small>
+											<br />
+											<Small>E-Mail: @context.Item.Email</Small>
 										</Column>
 									</Row>
 								</Column>
@@ -77,6 +79,10 @@
 													<FieldLabel>User Name</FieldLabel>
 													<TextEdit Placeholder="Enter user name..." />
 												</Field>
+												<Field>
+													<FieldLabel>User E-Mail</FieldLabel>
+													<TextEdit Placeholder="Enter user E-mail..."  />
+												</Field>
 												<Field>
 													<FieldLabel>User Password</FieldLabel>
 													<TextEdit Placeholder="Enter user password..." />
@@ -145,6 +151,18 @@
 					</Field>
 					<br />
 					<br />
+					<Field>
+						<FieldLabel>
+							<h5>
+								E-Mail
+							</h5>
+							<Paragraph>
+								Here you can change the E-Mail of a User
+							</Paragraph>
+						</FieldLabel>
+						<TextEdit Placeholder="Enter new email" />
+					</Field>
+					<br />
 					<Field>
 						<FieldLabel>
 							<h5>
@@ -189,7 +207,7 @@
 </Div>
 
 @code {
-	List<User> users = new List<User>() { new User("Silas", "aldjlfasd", Role.Admin), new User("Joe", "qiowruioewjfopa", Role.Admin), new User("Stefan", "adfadsdf", Role.Admin), new User("Manu", "öhöfldaösldf", Role.User) };
+	List<User> users = new List<User>() { new User("Silas", "aldjlfasd", "funny@gmail.com", Role.Admin), new User("Joe", "qiowruioewjfopa", "fluffmcfluff@hotmail.com", Role.Admin), new User("Stefan", "adfadsdf", "hahababaman@mail.com" , Role.Admin), new User("Manu", "öhöfldaösldf", "megatollermanu69@mail.com", Role.User) };
 
 	User? SelectedUser = null;
 	User? UserCopy = null;
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/AuthenticationService.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/AuthenticationService.cs
index 69b3ba9..a880860 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/AuthenticationService.cs
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/AuthenticationService.cs
@@ -120,7 +120,7 @@ public class AuthenticationService : IAuthenticationService
             return Result.Fail("User name already exists!");
         }
 
-        User user = new User(name, BC.HashPassword(password), role);
+        User user = new User(name, BC.HashPassword(password), "", role);
         _ = mainDatabaseContext.Users.Add(user);
 
         return (await Result.Try(() => mainDatabaseContext.SaveChangesAsync())).ToResult();