diff --git a/interface.c b/interface.c
index e5f8281..b5155fb 100644
--- a/interface.c
+++ b/interface.c
@@ -762,6 +762,9 @@ void print_service_message (struct message *M) {
   push_color (COLOR_GREY);
   
   push_color (COLOR_MAGENTA);
+  if (msg_num_mode) {
+    printf ("%d ", M->id);
+  }
   print_date (M->date);
   pop_color ();
   printf (" ");
diff --git a/loop.c b/loop.c
index 6d6908f..e78a73c 100644
--- a/loop.c
+++ b/loop.c
@@ -270,13 +270,11 @@ int loop (void) {
   if (verbosity) {
     logprintf ("DC_info: %d new DC got\n", new_dc_num);
   }
-  if (new_dc_num) {
-    int i;
-    for (i = 0; i <= MAX_DC_NUM; i++) if (DC_list[i] && !DC_list[i]->auth_key_id) {
-      dc_authorize (DC_list[i]);
-      assert (DC_list[i]->auth_key_id);
-      write_auth_file ();
-    }
+  int i;
+  for (i = 0; i <= MAX_DC_NUM; i++) if (DC_list[i] && !DC_list[i]->auth_key_id) {
+    dc_authorize (DC_list[i]);
+    assert (DC_list[i]->auth_key_id);
+    write_auth_file ();
   }
 
   if (auth_state == 100) {
@@ -362,7 +360,6 @@ int loop (void) {
     }
   }
 
-  int i;
   for (i = 0; i <= MAX_DC_NUM; i++) if (DC_list[i] && !DC_list[i]->has_auth) {
     do_export_auth (i);
     do_import_auth (i);