diff --git a/patch-tracking/patch_tracking/app.py b/patch-tracking/patch_tracking/app.py
index 108f922badbc65ca92b3d61ef4ef747d1b8635bc..e39ba4cb2f15f4f35ef927a9e737be0a44ab865c 100644
--- a/patch-tracking/patch_tracking/app.py
+++ b/patch-tracking/patch_tracking/app.py
@@ -62,7 +62,7 @@ def check_settings_conf():
     required_settings = ['LISTEN', 'GITHUB_ACCESS_TOKEN', 'GITEE_ACCESS_TOKEN', 'SCAN_DB_INTERVAL', 'USER', 'PASSWORD']
     for setting in required_settings:
         if setting in app.config:
-            if not app.config[setting]:
+            if app.config[setting] == "":
                 logger.error('%s is empty in settings.conf.', setting)
                 setting_error = True
             else:
diff --git a/patch-tracking/patch_tracking/cli/generate_password b/patch-tracking/patch_tracking/cli/generate_password
index b7772c3f9ff2c2da9b77460fba8a949148fc1309..4bf5861e952f391fd17907ed68ab8cc036e373b3 100644
--- a/patch-tracking/patch_tracking/cli/generate_password
+++ b/patch-tracking/patch_tracking/cli/generate_password
@@ -79,7 +79,7 @@ if __name__ == "__main__":
     err = latin1_encode(password_)
     if err:
         usage()
-        print("PASSWORD: outside the 'latin-1' character set range")
+        print("PASSWORD: only latin1 character set are allowed")
         sys.exit(1)
 
     ret = password_strength_check(password_)
diff --git a/patch-tracking/patch_tracking/cli/patch_tracking_cli.py b/patch-tracking/patch_tracking/cli/patch_tracking_cli.py
index d0fab66d833000795a124362ac144068b291746e..ec712eac22d8436a412cc0f19329d57e17b91633 100755
--- a/patch-tracking/patch_tracking/cli/patch_tracking_cli.py
+++ b/patch-tracking/patch_tracking/cli/patch_tracking_cli.py
@@ -143,10 +143,10 @@ def params_input_track(params, file_path=None):
 
     err = latin1_encode(user)
     if err:
-        return "error", "user: outside the 'latin-1' character set range"
+        return "error", "ERROR: user: only latin1 character set are allowed."
     err = latin1_encode(password)
     if err:
-        return "error", "password: outside the 'latin-1' character set range"
+        return "error", "ERROR: user: only latin1 character set are allowed."
 
     enabled = bool(enabled == 'true')
 
@@ -237,10 +237,12 @@ def delete(args):
 
     err = latin1_encode(user)
     if err:
-        return "error", "user: outside the 'latin-1' character set range"
+        print("ERROR: user: only latin1 character set are allowed.")
+        return
     err = latin1_encode(password)
     if err:
-        return "error", "password: outside the 'latin-1' character set range"
+        print("ERROR: password: Only latin1 character set are allowed.")
+        return
 
     url = '/'.join(['https:/', server, 'tracking'])
     if args.branch: