diff --git a/admin/db-provider.go b/admin/db-provider.go
index eda63b9..91f2bff 100644
--- a/admin/db-provider.go
+++ b/admin/db-provider.go
@@ -126,9 +126,8 @@ func newUserProvider(c *gin.Context) {
 		c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": fmt.Sprintf("Something is wrong in received data: %s", err.Error())})
 		return
 	}
-	us.Id = nil
 
-	src, err := storage.MainStore.CreateProvider(user.(*happydns.User), us, "")
+	src, err := storage.MainStore.CreateProvider(user.(*happydns.User), us.Provider, us.Comment)
 	ApiResponse(c, src, err)
 }
 
diff --git a/admin/db-user.go b/admin/db-user.go
index f5f84ee..73f5816 100644
--- a/admin/db-user.go
+++ b/admin/db-user.go
@@ -78,9 +78,12 @@ func newUser(c *gin.Context) {
 		c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": fmt.Sprintf("Something is wrong in received data: %s", err.Error())})
 		return
 	}
-	uu.Id = []byte{}
 
-	ApiResponse(c, uu, storage.MainStore.CreateUser(uu))
+	if uu.Id.IsEmpty() {
+		ApiResponse(c, uu, storage.MainStore.CreateUser(uu))
+	} else {
+		ApiResponse(c, uu, storage.MainStore.UpdateUser(uu))
+	}
 }
 
 func deleteUsers(c *gin.Context) {