diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8e4878c97..d16d93ae5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,7 +68,7 @@
 
 		<activity android:name="org.linphone.LinphoneActivity"
 		    android:theme="@style/NoTitle"
-            android:screenOrientation="nosensor"
+            android:screenOrientation="behind"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java
index 2e295ab68..82b4409d9 100644
--- a/src/org/linphone/LinphoneLauncherActivity.java
+++ b/src/org/linphone/LinphoneLauncherActivity.java
@@ -59,7 +59,6 @@ public class LinphoneLauncherActivity extends Activity {
         
 		mHandler = new Handler();
 
-
 		if (getResources().getBoolean(R.bool.enable_push_id)) {
 			Compatibility.initPushNotificationService(this);
 		}
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index 2c8219a3a..d7d6b3e50 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -109,13 +109,13 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 		int id = v.getId();
 		
 		if (id == R.id.setup_cancel) {
+			LinphonePreferences.instance().firstLaunchSuccessful();
 			if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
 				moveTaskToBack(true);
 			} else {
 				setResult(Activity.RESULT_CANCELED);
 				finish();
 			}
-			LinphonePreferences.instance().firstLaunchSuccessful();
 		} else if (id == R.id.setup_next) {
 			if (firstFragment == SetupFragmentsEnum.LINPHONE_LOGIN) {
 				LinphoneLoginFragment linphoneFragment = (LinphoneLoginFragment) fragment;
@@ -140,13 +140,13 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 	@Override
 	public void onBackPressed() {
 		if (currentFragment == firstFragment) {
+			LinphonePreferences.instance().firstLaunchSuccessful();
 			if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
 				moveTaskToBack(true);
 			} else {
 				setResult(Activity.RESULT_CANCELED);
 				finish();
 			}
-			LinphonePreferences.instance().firstLaunchSuccessful();
 		}
 		if (currentFragment == SetupFragmentsEnum.MENU) {
 			WelcomeFragment fragment = new WelcomeFragment();