diff --git a/internal/rootmux/admin_test.go b/internal/rootmux/admin_test.go
index 945d11fc542ee8df12e2e746dd404ed60b4b1cee..7c801a3d1a1389fe82e05edf8af44d17f044020a 100644
--- a/internal/rootmux/admin_test.go
+++ b/internal/rootmux/admin_test.go
@@ -64,9 +64,9 @@ func AdminTests(t *testing.T) {
 		xsrfHeader := tester.Header{Key: "XSRF-TOKEN", Value: token.XSRFToken}
 
 		// Create a Client
-		do("POST", apiAdminUsers, xsrfHeader, `{"login":"UserTest","password": "password","role":"CLIENT"}`, 200, `{"id":7,"idOAuth":"","login":"UserTest","role":"CLIENT","passwordHash":"`)
+		do("POST", apiAdminUsers, xsrfHeader, `{"login":"UserTest","password": "password","role":"CLIENT"}`, 200, `{"id":7,"idOAuth":"","login":"UserTest","role":"CLIENT"`)
 		// Create a Banker
-		do("POST", apiAdminUsers, xsrfHeader, `{"login":"BankerTest","password": "password","role":"BANKER"}`, 200, `{"id":8,"idOAuth":"","login":"BankerTest","role":"BANKER","passwordHash":"`)
+		do("POST", apiAdminUsers, xsrfHeader, `{"login":"BankerTest","password": "password","role":"BANKER"}`, 200, `{"id":8,"idOAuth":"","login":"BankerTest","role":"BANKER"`)
 		// Get all users
 		do("GET", apiAdminUsers, xsrfHeader, ``, 200, `[{"id":1,"idOAuth":"","login":"Dupond"`)
 		// Delete created users
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index ec1bf13f83e7171c092881a27776a3cef1460d4f..8ea2fabc478f11a617c3cc053c46b0c52a4b1b13 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -32,7 +32,7 @@ type User struct {
 	IsAdmin      bool   `json:"isAdmin,omitempty"`
 	Name         string `json:"name,omitempty"`
 	Surname      string `json:"surname,omitempty"`
-	PasswordHash string `json:"passwordHash,omitempty"`
+	PasswordHash string `json:"-"`
 	Password     string `json:"password,omitempty"`
 }
 
diff --git a/pkg/auth/inmemory.go b/pkg/auth/inmemory.go
index 870944ec9bb29ded5fff3b9a0197f1629fd51210..140ddc1f60b3094c2b02c36864caa378a73d8e88 100644
--- a/pkg/auth/inmemory.go
+++ b/pkg/auth/inmemory.go
@@ -97,7 +97,7 @@ func (d *DataHandler) AddUser(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 	// Encrypt the password with bcrypt
-	if newUser.Password == "" && newUser.PasswordHash == "" {
+	if newUser.Password == "" {
 		http.Error(w, "passwords cannot be blank", 400)
 		return
 	}
@@ -154,11 +154,6 @@ func (d *DataHandler) UpdateUser(w http.ResponseWriter, req *http.Request) {
 		user.Name = newUser.Name
 		user.Surname = newUser.Surname
 		user.Role = newUser.Role
-		// Encrypt the password with bcrypt if appropriate
-		if newUser.Password == "" && newUser.PasswordHash == "" {
-			http.Error(w, "passwords cannot be blank", http.StatusBadRequest)
-			return
-		}
 		if newUser.Password != "" {
 			hash, err := bcrypt.GenerateFromPassword([]byte(newUser.Password), bcrypt.DefaultCost)
 			if err != nil {