diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index ef6c6050..4564bd6f 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -18,10 +18,12 @@
   <uses-permission android:name="android.permission.INTERNET" />
 
   <application>
-    <activity android:name=".AuthorizationManagementActivity"
-      android:exported="false"
-      android:theme="@android:style/Theme.Translucent.NoTitleBar"
-      android:launchMode="singleTask" />
+    <activity
+        android:name=".AuthorizationManagementActivity"
+        android:exported="false"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar"
+        android:screenOrientation="portrait"
+        android:launchMode="singleTask" />
 
     <activity android:name=".RedirectUriReceiverActivity" android:exported="true">
       <intent-filter>
diff --git a/library/java/net/openid/appauth/AuthorizationManagementActivity.java b/library/java/net/openid/appauth/AuthorizationManagementActivity.java
index 3eddac43..5f472fbb 100644
--- a/library/java/net/openid/appauth/AuthorizationManagementActivity.java
+++ b/library/java/net/openid/appauth/AuthorizationManagementActivity.java
@@ -161,6 +161,8 @@ public static Intent createStartIntent(
         intent.putExtra(KEY_AUTH_REQUEST, request.jsonSerializeString());
         intent.putExtra(KEY_COMPLETE_INTENT, completeIntent);
         intent.putExtra(KEY_CANCEL_INTENT, cancelIntent);
+
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         return intent;
     }