diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 9dc26fa06..9fb252597 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -533,8 +533,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			// was a new proxy config, add it
 			linphone_core_add_proxy_config(lc, proxyCfg);
 			linphone_core_set_default_proxy_config(lc, proxyCfg);
-			// reload address book to prepend proxy config domain to contacts' phone number
-			[[[LinphoneManager instance] fastAddressBook] reload];
 		}
 
 	bad_proxy:
@@ -559,6 +557,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 							  otherButtonTitles:nil] show];
 		}
 	}
+	// reload address book to prepend proxy config domain to contacts' phone number
 	[[[LinphoneManager instance] fastAddressBook] reload];
 }
 
diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index d07fa9ac3..e12a9f897 100644
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@@ -176,8 +176,8 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
 }
 
 - (void)loadData {
-	ABAddressBookRevert(addressBook);
 	@synchronized(_addressBookMap) {
+		ABAddressBookRevert(addressBook);
 		[_addressBookMap removeAllObjects];
 
 		CFArrayRef lContacts = ABAddressBookCopyArrayOfAllPeople(addressBook);
diff --git a/prepare.py b/prepare.py
index 9ca12476a..aca19f628 100755
--- a/prepare.py
+++ b/prepare.py
@@ -418,7 +418,7 @@ def main(argv=None):
     argparser.add_argument(
         '--enable-non-free-codecs', help="Enable non-free codecs such as OpenH264, MPEG4, etc.. Final application must comply with their respective license (see README.md).", action='store_true')
     argparser.add_argument(
-        '-G' '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator')
+        '-G', '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator')
     argparser.add_argument(
         '-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
     argparser.add_argument(