diff --git a/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java b/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
index 1ade68d6167b62cd2ba9c582a4495870114df677..ac063e7c010bfd1f03805db6796ce94845b77660 100644
--- a/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
+++ b/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
@@ -58,6 +58,7 @@ implements InvitationListener {
 	private AuthorId localAuthorId = null;
 	private String networkName = null;
 	private boolean bluetoothEnabled = false;
+	private BluetoothWifiStateReceiver receiver = null;
 	private int localInvitationCode = -1, remoteInvitationCode = -1;
 	private int localConfirmationCode = -1, remoteConfirmationCode = -1;
 	private boolean connectionFailed = false;
@@ -145,7 +146,7 @@ implements InvitationListener {
 		filter.addAction(ACTION_STATE_CHANGED);
 		filter.addAction(ACTION_SCAN_MODE_CHANGED);
 		filter.addAction(NETWORK_STATE_CHANGED_ACTION);
-		BluetoothWifiStateReceiver receiver = new BluetoothWifiStateReceiver();
+		receiver = new BluetoothWifiStateReceiver();
 		registerReceiver(receiver, filter);
 
 		// Get the current Bluetooth and WiFi state
@@ -188,6 +189,7 @@ implements InvitationListener {
 	public void onDestroy() {
 		super.onDestroy();
 		if(task != null) task.removeListener(this);
+		unregisterReceiver(receiver);
 		unbindService(serviceConnection);
 	}
 
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
index d9b2901e913ff81d7572772409f601cb0f98346e..6685abc36f2d98f39af64023fc1d7ee8538ebc45 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
@@ -54,7 +54,7 @@ implements OnEditorActionListener, OnClickListener {
 					continueButton.setEnabled(getText().length() == 6);
 			}
 		};
-		codeEntry.setId(1);
+		codeEntry.setId(1); // FIXME: State is not saved and restored
 		codeEntry.setTextSize(26);
 		codeEntry.setOnEditorActionListener(this);
 		codeEntry.setMinEms(5);