1 files changed, 3 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index 4cc6be4f..15cc5b4d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -172,6 +172,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 			eipStatus.setText(R.string.state_noprocess);
 		}
 		eipAutoSwitched = true;
+		saveEipStatus();
 	}
 	
 
@@ -179,6 +180,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	mEipStartPending = true;
 	eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
 	((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending);
+	eipSwitch.setChecked(true);	
+	saveEipStatus();
 	eipCommand(EIP.ACTION_START_EIP);
     }