diff --git a/src/password.c b/src/password.c
index 3d9311a..2de1a76 100644
--- a/src/password.c
+++ b/src/password.c
@@ -155,7 +155,10 @@ zenity_password_dialog_response (GtkWidget *widget, int response, gpointer data)
   switch (response) {
     case GTK_RESPONSE_OK:
       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
-      g_print ("%s\n", gtk_entry_get_text (GTK_ENTRY(password_data->entry_password)));
+      if (password_data->username)
+        g_print("%s|%s\n", gtk_entry_get_text (GTK_ENTRY(password_data->entry_username)), gtk_entry_get_text (GTK_ENTRY(password_data->entry_password)));
+      else
+        g_print ("%s\n", gtk_entry_get_text (GTK_ENTRY(password_data->entry_password)));
       break;
 
     case GTK_RESPONSE_CANCEL: