diff --git a/js/api.js b/js/api.js
index 023a4398dd..66fba9154b 100644
--- a/js/api.js
+++ b/js/api.js
@@ -99,6 +99,11 @@ var API	= new function() {
 	};
 
 	this.registerKeys = function(keys, success_callback, error_callback) {
+		//TODO: Do this conversion somewhere else?
+		var identityKey = btoa(getString(keys.keys[0].identityKey));
+		for (var i = 0; i < keys.keys.length; i++)
+			keys.keys[i] = {keyId: i, publicKey: btoa(getString(keys.keys[i].publicKey)), identityKey: identityKey};
+		keys.lastResortKey = {keyId: keys.lastResortKey.keyId, publicKey: btoa(getString(keys.lastResortKey.publicKey)), identityKey: identityKey};
 		this.doAjax({
 			call				: 'keys',
 			httpType			: 'PUT',
diff --git a/js/helpers.js b/js/helpers.js
index f6a9d558b0..9c0f2d335c 100644
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -855,7 +855,7 @@ var crypto_tests = {};
 		if (identityKey === undefined)
 			crypto_storage.getNewPubKeySTORINGPrivKey("identityKey", function(pubKey) { identityKeyCalculated(pubKey); });
 		else
-			identityKeyCalculated(pubKey);
+			identityKeyCalculated(identityKey);
 	}
 
 }( window.crypto = window.crypto || {}, jQuery ));
diff --git a/js/options.js b/js/options.js
index 615f6e6616..381c7cef94 100644
--- a/js/options.js
+++ b/js/options.js
@@ -58,7 +58,7 @@ $('#init-go').click(function() {
 		$('#verify4done').html('');
 		$('#verify').show();
 
-		API.confirmCode(code, number, password, signaling_key, single_device,
+		API.confirmCode($('#code').val(), number, password, signaling_key, single_device,
 			function(response) {
 				if (single_device)
 					response = 1;
diff --git a/options.html b/options.html
index b5d34b2db2..fad6e53ccb 100644
--- a/options.html
+++ b/options.html
@@ -41,7 +41,6 @@
 	<script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script>
 	<script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script>
 	<script type="text/javascript" src="js/api.js"></script>
-	<script type="text/javascript" src="js/fake_api.js"></script>
 	<script type="text/javascript" src="js/helpers.js"></script>
 	<script type="text/javascript" src="js/options.js"></script>
 </body>