diff --git a/admin/mod.c b/admin/mod.c
index 705998ef0..8d69cdd0d 100644
--- a/admin/mod.c
+++ b/admin/mod.c
@@ -71,7 +71,9 @@ doit2(HDB *db, hdb_entry *ent)
 	fprintf(stderr, "Please answer yes or no.\n");
     }
     if(buf[0] == 'y' || buf[0] == 'Y')
-	set_password (ent);
+	if(set_password (ent))
+	    return;
+	    
     set_modified_by (ent);
     
     ret = db->store(context, db, 1, ent);