diff --git a/commerce_addressbook.module b/commerce_addressbook.module
index fc1b02a..ed708f3 100644
--- a/commerce_addressbook.module
+++ b/commerce_addressbook.module
@@ -521,7 +521,21 @@ function commerce_addressbook_commerce_order_insert($order) {
  * Set the new customer profile as default if there's none.
  */
 function commerce_addressbook_commerce_customer_profile_insert($profile) {
-  if (!empty($profile->profile_id)) {
+  if (!empty($profile->profile_id) && $profile->uid <> 0) {
+    $default_profile = commerce_addressbook_get_default_profile_id($profile->uid, $profile->type);
+    if (!$default_profile) {
+      commerce_addressbook_set_default_profile($profile);
+    }
+  }
+}
+
+/**
+ * Implements hook_commerce_customer_profile_update().
+ *
+ * Set the last updated customer profile as default if there's none.
+ */
+function commerce_addressbook_commerce_customer_profile_update($profile) {
+  if (!empty($profile->profile_id) && $profile->uid <> 0) {
     $default_profile = commerce_addressbook_get_default_profile_id($profile->uid, $profile->type);
     if (!$default_profile) {
       commerce_addressbook_set_default_profile($profile);