diff --git a/app/src/main/java/me/impy/aegis/AuthActivity.java b/app/src/main/java/me/impy/aegis/AuthActivity.java
index d0cf80a3..b1322a67 100644
--- a/app/src/main/java/me/impy/aegis/AuthActivity.java
+++ b/app/src/main/java/me/impy/aegis/AuthActivity.java
@@ -62,6 +62,11 @@ public class AuthActivity extends AppCompatActivity {
         });
     }
 
+    @Override
+    public void onBackPressed() {
+        // ignore back button presses
+    }
+
     private char[] getPassword(boolean clear) {
         char[] password = getEditTextChars(textPassword);
         if (clear) {
diff --git a/app/src/main/java/me/impy/aegis/IntroActivity.java b/app/src/main/java/me/impy/aegis/IntroActivity.java
index 79a15193..d12aea47 100644
--- a/app/src/main/java/me/impy/aegis/IntroActivity.java
+++ b/app/src/main/java/me/impy/aegis/IntroActivity.java
@@ -34,8 +34,6 @@ public class IntroActivity extends AppIntro {
         showSkipButton(false);
         //showPagerIndicator(false);
         setGoBackLock(true);
-        // TODO: remove this once github.com/apl-devs/AppIntro/issues/347 is fixed
-        setSwipeLock(true);
 
         SliderPage homeSliderPage = new SliderPage();
         homeSliderPage.setTitle("Welcome");