diff --git a/js/options.js b/js/options.js
index 93ffe4581..a2792b2cf 100644
--- a/js/options.js
+++ b/js/options.js
@@ -139,10 +139,12 @@ $('#init-go').click(function() {
 });
 
 textsecure.registerOnLoadFunction(function() {
-	if (!isRegistrationDone()) {
-		$('#init-setup').show();
-	} else {
-		$('#complete-number').html(textsecure.storage.getUnencrypted("number_id").split(".")[0]);
-		$('#setup-complete').show();
-	}
+    $(function() {
+        if (!isRegistrationDone()) {
+            $('#init-setup').show();
+        } else {
+            $('#complete-number').html(textsecure.storage.getUnencrypted("number_id").split(".")[0]);
+            $('#setup-complete').show();
+        }
+    });
 });
diff --git a/options.html b/options.html
index 0e9b11db5..44e70bc4f 100644
--- a/options.html
+++ b/options.html
@@ -56,7 +56,7 @@
 	<script type="text/javascript" src="js/crypto.js"></script>
 	<script type="text/javascript" src="js/api.js"></script>
 	<script type="text/javascript" src="js/helpers.js"></script>
-	<script type="text/javascript" src="js/options.js"></script>
 	<script type="text/javascript" src="js/chromium.js"></script>
+	<script type="text/javascript" src="js/options.js"></script>
 </body>
 </html>