diff --git a/pkg/models/user_delete.go b/pkg/models/user_delete.go
index ab6ef7cc6..5f8a6d88d 100644
--- a/pkg/models/user_delete.go
+++ b/pkg/models/user_delete.go
@@ -177,6 +177,16 @@ func ensureProjectAdminUser(s *xorm.Session, l *Project) (hadUsers bool, err err
 		}
 	}
 
+	for _, lu := range projectUsers {
+		if lu.Right == RightWrite {
+			lu.Right = RightAdmin
+			_, err = s.Where("id = ?", lu.ID).
+				Cols("right").
+				Update(lu)
+			return true, err
+		}
+	}
+
 	firstUser := projectUsers[0]
 	firstUser.Right = RightAdmin
 	_, err = s.Where("id = ?", firstUser.ID).
@@ -203,6 +213,16 @@ func ensureProjectAdminTeam(s *xorm.Session, l *Project) (hadTeams bool, err err
 		}
 	}
 
+	for _, lu := range projectTeams {
+		if lu.Right == RightWrite {
+			lu.Right = RightAdmin
+			_, err = s.Where("id = ?", lu.ID).
+				Cols("right").
+				Update(lu)
+			return true, err
+		}
+	}
+
 	firstTeam := projectTeams[0]
 	firstTeam.Right = RightAdmin
 	_, err = s.Where("id = ?", firstTeam.ID).