diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index f46b8469..c17be54f 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -170,6 +170,33 @@
       </button>
     </dialog>
 
+    <div class="flex py-2">
+      <button class="text-center text-md text-blue-500" @click="checkLimits()">
+        Check Limits
+      </button>
+      <!-- show spinner if loading limits -->
+      <div v-if="loadingLimits" class="ml-2">
+        Checking... <fa icon="spinner" class="fa-spin"></fa>
+      </div>
+      <div class="ml-2">
+        {{ limitsMessage }}
+      </div>
+      <div v-if="!!limits?.nextWeekBeginDateTime" class="px-9">
+        <span class="font-bold">Rate Limits</span>
+        <p>
+          You have done {{ limits.doneClaimsThisWeek }} claims out of
+          {{ limits.maxClaimsPerWeek }} for this week. Your claims counter
+          resets at {{ readableTime(limits.nextWeekBeginDateTime) }}
+        </p>
+        <p>
+          You have done {{ limits.doneRegistrationsThisMonth }} registrations
+          out of {{ limits.maxRegistrationsPerMonth }} for this month. Your
+          registrations counter resets at
+          {{ readableTime(limits.nextMonthBeginDateTime) }}
+        </p>
+      </div>
+    </div>
+
     <h3
       class="text-sm uppercase font-semibold mb-3"
       @click="showAdvanced = !showAdvanced"
@@ -202,36 +229,6 @@
         <div class="ml-2">Show amounts given with contacts</div>
       </label>
 
-      <div class="flex py-2">
-        <button
-          class="text-center text-md text-blue-500"
-          @click="checkLimits()"
-        >
-          Check Limits
-        </button>
-        <!-- show spinner if loading limits -->
-        <div v-if="loadingLimits" class="ml-2">
-          Checking... <fa icon="spinner" class="fa-spin"></fa>
-        </div>
-        <div class="ml-2">
-          {{ limitsMessage }}
-        </div>
-        <div v-if="!!limits?.nextWeekBeginDateTime" class="px-9">
-          <span class="font-bold">Rate Limits</span>
-          <p>
-            You have done {{ limits.doneClaimsThisWeek }} claims out of
-            {{ limits.maxClaimsPerWeek }} for this week. Your claims counter
-            resets at {{ readableTime(limits.nextWeekBeginDateTime) }}
-          </p>
-          <p>
-            You have done {{ limits.doneRegistrationsThisMonth }} registrations
-            out of {{ limits.maxRegistrationsPerMonth }} for this month. Your
-            registrations counter resets at
-            {{ readableTime(limits.nextMonthBeginDateTime) }}
-          </p>
-        </div>
-      </div>
-
       <div class="flex py-2">
         <router-link
           :to="{ name: 'identity-switcher' }"
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index fac66d2e..20553e6d 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -121,19 +121,21 @@
             </button>
 
             <button
-              v-if="contact.registered"
-              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-              title="Registered"
-            >
-              <fa icon="person-circle-check" class="fa-fw" />
-            </button>
-            <button
-              v-else
               @click="register(contact)"
               class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-              title="Registration unknown"
             >
-              <fa icon="person-circle-question" class="fa-fw" />
+              <fa
+                v-if="contact.registered"
+                icon="person-circle-check"
+                class="fa-fw"
+                title="Registered"
+              />
+              <fa
+                v-else
+                icon="person-circle-question"
+                class="fa-fw"
+                title="Registration Unknown"
+              />
             </button>
 
             <button
@@ -459,6 +461,7 @@ export default class ContactsView extends Vue {
       confirm(
         "Are you sure you want to use one of your registrations for " +
           this.nameForDid(this.contacts, contact.did) +
+          (contact.registered ? " -- especially since they are already marked as registered" : "") +
           "?",
       )
     ) {