diff -r fdb8b167200e -r 4b0fd98a170c pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Sat Nov 01 16:24:56 2008 +0000
+++ b/pidgin/gtkaccount.c	Sat Nov 01 16:45:09 2008 +0000
@@ -562,7 +562,8 @@
 
 	/* Set the fields. */
 	if (dialog->account != NULL) {
-		if (purple_account_get_password(dialog->account))
+		if (purple_account_get_password(dialog->account) &&
+		    purple_account_get_remember_password(dialog->account))
 			gtk_entry_set_text(GTK_ENTRY(dialog->password_entry),
 							   purple_account_get_password(dialog->account));