diff --git a/pkg/api/password.go b/pkg/api/password.go
index 4454a486001..42f7fa722ae 100644
--- a/pkg/api/password.go
+++ b/pkg/api/password.go
@@ -64,6 +64,11 @@ func (hs *HTTPServer) ResetPassword(c *models.ReqContext) response.Response {
 		return response.Error(400, "Passwords do not match", nil)
 	}
 
+	password := models.Password(form.NewPassword)
+	if password.IsWeak() {
+		return response.Error(400, "New password is too short", nil)
+	}
+
 	cmd := models.ChangeUserPasswordCommand{}
 	cmd.UserId = query.Result.Id
 	var err error