diff --git a/server/crypto/common.go b/server/crypto/common.go
index 55dde66..7f9af48 100644
--- a/server/crypto/common.go
+++ b/server/crypto/common.go
@@ -144,11 +144,13 @@ func VerifyPassword(storedHashedPassword, userProvidedPassword string) error {
 
 // EncryptPassword is used for encrypting password
 func EncryptPassword(password string) (string, error) {
-	// Try to generate bcrypt hash
-	passwordSHA256 := getSHA256(password)
-	pw, err := bcrypt.GenerateFromPassword([]byte(passwordSHA256), bcrypt.DefaultCost)
+	pw, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
 	if err != nil {
-		return "", err
+		password = getSHA256(password)
+		pw, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+		if err != nil {
+			return "", err
+		}
 	}
 
 	return string(pw), nil