diff --git a/client/csync_auth.c b/client/csync_auth.c
index 9707d7a0a7..0181ea2453 100644
--- a/client/csync_auth.c
+++ b/client/csync_auth.c
@@ -75,9 +75,9 @@ int csync_auth(const char *prompt, char *buf, size_t len, int echo, int verify)
   /* read the password */
   while (!ok) {
     if (*buf) {
-      fprintf(stdout, "%s: [%s] ", prompt, buf);
+      fprintf(stdout, "%s [%s] ", prompt, buf);
     } else {
-      fprintf(stdout, "%s: ", prompt);
+      fprintf(stdout, "%s ", prompt);
     }
     fflush(stdout);
     while (! fgets(tmp, len, stdin));
@@ -85,6 +85,7 @@ int csync_auth(const char *prompt, char *buf, size_t len, int echo, int verify)
     if ((ptr = strchr(tmp, '\n'))) {
       *ptr = '\0';
     }
+    fprintf(stdout, "\n");
 
     if (*tmp) {
       strncpy(buf, tmp, len);
@@ -103,7 +104,8 @@ int csync_auth(const char *prompt, char *buf, size_t len, int echo, int verify)
       if ((ptr = strchr(key_string, '\n'))) {
         *ptr = '\0';
       }
-      if (strcmp(buf ,key_string)) {
+      fprintf(stdout, "\n");
+      if (strcmp(buf, key_string)) {
         printf("\n\07\07Mismatch - try again\n");
         fflush(stdout);
         continue;
diff --git a/modules/csync_smb.c b/modules/csync_smb.c
index cd1ace2c78..a12f40a68a 100644
--- a/modules/csync_smb.c
+++ b/modules/csync_smb.c
@@ -76,8 +76,8 @@ static void get_auth_data_with_context_fn(SMBCCTX *c,
   /* Call the passwort prompt */
   if (auth_cb != NULL) {
     DEBUG_SMB(("csync_smb - execute authentication callback\n"));
-    (*auth_cb) ("Username", un, unlen, 1, 0);
-    (*auth_cb) ("Password", pw, pwlen, 0, 0);
+    (*auth_cb) ("Username:", un, unlen, 1, 0);
+    (*auth_cb) ("Password:", pw, pwlen, 0, 0);
   }
 
   DEBUG_SMB(("csync_smb - user=%s, workgroup=%s, server=%s, share=%s\n",