diff --git a/pkg/auth/credentials.go b/pkg/auth/credentials.go
index 007803032..888022c3d 100644
--- a/pkg/auth/credentials.go
+++ b/pkg/auth/credentials.go
@@ -57,8 +57,8 @@ const (
 
 // Common errors generated for access and secret key validation.
 var (
-	ErrInvalidAccessKeyLength = fmt.Errorf("access key must be minimum %v or more characters long", accessKeyMinLen)
-	ErrInvalidSecretKeyLength = fmt.Errorf("secret key must be minimum %v or more characters long", secretKeyMinLen)
+	ErrInvalidAccessKeyLength = fmt.Errorf("access key length should be between %d and %d", accessKeyMinLen, accessKeyMaxLen)
+	ErrInvalidSecretKeyLength = fmt.Errorf("secret key length should be between %d and %d", secretKeyMinLen, secretKeyMaxLen)
 )
 
 // IsAccessKeyValid - validate access key for right length.
@@ -230,11 +230,11 @@ func GetNewCredentialsWithMetadata(m map[string]interface{}, tokenSecret string)
 // and generate a session token if a secret token is provided.
 func CreateNewCredentialsWithMetadata(accessKey, secretKey string, m map[string]interface{}, tokenSecret string) (cred Credentials, err error) {
 	if len(accessKey) < accessKeyMinLen || len(accessKey) > accessKeyMaxLen {
-		return Credentials{}, fmt.Errorf("access key length should be between %d and %d", accessKeyMinLen, accessKeyMaxLen)
+		return Credentials{}, ErrInvalidAccessKeyLength
 	}
 
 	if len(secretKey) < secretKeyMinLen || len(secretKey) > secretKeyMaxLen {
-		return Credentials{}, fmt.Errorf("secret key length should be between %d and %d", secretKeyMinLen, secretKeyMaxLen)
+		return Credentials{}, ErrInvalidSecretKeyLength
 	}
 
 	cred.AccessKey = accessKey