diff --git a/app/authentication.go b/app/authentication.go
index 1dd541b4da..6f5c406fcb 100644
--- a/app/authentication.go
+++ b/app/authentication.go
@@ -46,10 +46,6 @@ func (tl TokenLocation) String() string {
 
 func (a *App) IsPasswordValid(password string) *model.AppError {
 
-	if *a.Config().ServiceSettings.EnableDeveloper {
-		return nil
-	}
-
 	if err := users.IsPasswordValidWithSettings(password, &a.Config().PasswordSettings); err != nil {
 		var invErr *users.ErrInvalidPassword
 		switch {
diff --git a/app/users/password.go b/app/users/password.go
index da286f73ad..b25cc23224 100644
--- a/app/users/password.go
+++ b/app/users/password.go
@@ -39,10 +39,6 @@ func ComparePassword(hash string, password string) error {
 
 func (us *UserService) isPasswordValid(password string) error {
 
-	if *us.config().ServiceSettings.EnableDeveloper {
-		return nil
-	}
-
 	return IsPasswordValidWithSettings(password, &us.config().PasswordSettings)
 }