diff --git a/app/build.gradle b/app/build.gradle
index 597b260..f466cfe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "nl.privacydragon.bookwyrm"
         minSdk 23
         targetSdk 34
-        versionCode 12
-        versionName "1.3.5"
+        versionCode 13
+        versionName "1.3.6"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -18,6 +18,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            vcsInfo.include false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -26,6 +27,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     namespace 'nl.privacydragon.bookwyrm'
+    dependenciesInfo {
+        includeInApk false
+        includeInBundle false
+    }
 }
 
 dependencies {
diff --git a/app/release/Bookwyrm-v1.3.5.apk b/app/release/Bookwyrm-v1.3.5.apk
deleted file mode 100644
index dde785c..0000000
Binary files a/app/release/Bookwyrm-v1.3.5.apk and /dev/null differ
diff --git a/app/release/Bookwyrm-v1.3.6.apk b/app/release/Bookwyrm-v1.3.6.apk
new file mode 100644
index 0000000..c689bf0
Binary files /dev/null and b/app/release/Bookwyrm-v1.3.6.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index aaba0f9..7298ce6 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 12,
-      "versionName": "1.3.5",
+      "versionCode": 13,
+      "versionName": "1.3.6",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3bbd7a..ba701b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
     <uses-feature android:name="android.hardware.camera" />
 
     <application
-        android:allowBackup="false"
+        android:fullBackupContent="false"
+        android:dataExtractionRules="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher_wyrm"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_wyrm_round"
diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java
index 75bde40..4993fe4 100644
--- a/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java
+++ b/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java
@@ -205,6 +205,7 @@ public class HandlerActivity extends AppCompatActivity {
         }
         //Convert the decrypted password back to a string.
         String passw = new String(truePass, StandardCharsets.UTF_8);
+        String wacht = passw.replaceAll("'", "\\\\'");
 
         //A webviewclient thing is needed for some stuff. To automatically log in, the credentials are put in the form by the javascript that is loaded once the page is fully loaded. Then it is automatically submitted if the current page is the login page.
         String finalToGoServer = toGoServer;
@@ -213,7 +214,7 @@ public class HandlerActivity extends AppCompatActivity {
                 LoadIndicator.setVisibility(View.GONE);
                 myWebView.setVisibility(View.VISIBLE);
 
-                view.loadUrl("javascript:(function() { document.getElementById('id_password').value = '" + passw + "'; ;})()");
+                view.loadUrl("javascript:(function() { document.getElementById('id_password').value = '" + wacht + "'; ;})()");
                 view.loadUrl("javascript:(function() { document.getElementById('id_localname').value = '" + name + "'; ;})()");
                 view.loadUrl("javascript:(function() { if (window.location.href == '" + finalToGoServer + "' && !/(review|generatednote|quotation|comment|book)/i.test(window.location.href)) { document.getElementsByName(\"login\")[0].submit();} ;})()");
                 view.loadUrl("javascript:(function() { if (window.location.href == 'https://" + server + "') { document.getElementsByName(\"login\")[0].submit();} ;})()");
@@ -311,7 +312,7 @@ public class HandlerActivity extends AppCompatActivity {
     }
 
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
         // Check if the key event was the Back button and if there's history
         if ((keyCode == KeyEvent.KEYCODE_BACK) && myWebView.canGoBack()) {
             myWebView.goBack();
@@ -319,7 +320,7 @@ public class HandlerActivity extends AppCompatActivity {
         }
         // If it wasn't the Back key or there's no web page history, bubble up to the default
         // system behavior (probably exit the activity)
-        return super.onKeyDown(keyCode, event);
+        return super.onKeyUp(keyCode, event);
     }
     @Override
     public boolean onKeyLongPress(int keyCode, KeyEvent event) {
diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java
index 655f727..c12723d 100644
--- a/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java
+++ b/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java
@@ -6,7 +6,6 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
-//import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Base64;
 import android.view.View;
@@ -71,7 +70,7 @@ public class MainActivity extends AppCompatActivity {
             //All fields are required, so if one of them is empty, the user should see a warning.
             if (server.isEmpty() || pass.isEmpty() || name.isEmpty()) {
                 TextView ErrorMessage = (TextView) findViewById(R.id.textView5);
-                ErrorMessage.setTextColor(Color.RED);
+                ErrorMessage.setTextColor(Color.YELLOW);
                 ErrorMessage.setText("ERROR: All fields are required!");
             } else {
                 //Likely this will be the first time the program is run. So create a new key thing in the android key store happening.
diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java
index 73255c0..4e0a23c 100644
--- a/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java
+++ b/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java
@@ -166,6 +166,7 @@ public class StartActivity extends AppCompatActivity {
         }
         //Convert the decrypted password back to a string.
         String passw = new String(truePass, StandardCharsets.UTF_8);
+        String wacht = passw.replaceAll("'", "\\\\'");
 
         //A webviewclient thing is needed for some stuff. To automatically log in, the credentials are put in the form by the javascript that is loaded once the page is fully loaded. Then it is automatically submitted if the current page is the login page.
         myWebView.setWebViewClient(new MyWebViewClient(){
@@ -173,7 +174,7 @@ public class StartActivity extends AppCompatActivity {
                 LoadIndicator.setVisibility(View.GONE);
                 myWebView.setVisibility(View.VISIBLE);
 
-                view.loadUrl("javascript:(function() { document.getElementById('id_password_confirm').value = '" + passw + "'; ;})()");
+                view.loadUrl("javascript:(function() { document.getElementById('id_password_confirm').value = '" + wacht + "'; ;})()");
                 view.loadUrl("javascript:(function() { document.getElementById('id_localname_confirm').value = '" + name + "'; ;})()");
                 view.loadUrl("javascript:(function() { if (window.location.href == 'https://" + server + "/login') { document.getElementsByName(\"login-confirm\")[0].submit();} ;})()");
                 view.loadUrl("javascript:(function() { " +
@@ -237,7 +238,7 @@ public class StartActivity extends AppCompatActivity {
     }
 
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
         // Check if the key event was the Back button and if there's history
         if ((keyCode == KeyEvent.KEYCODE_BACK) && myWebView.canGoBack()) {
             myWebView.goBack();
@@ -245,7 +246,7 @@ public class StartActivity extends AppCompatActivity {
         }
         // If it wasn't the Back key or there's no web page history, bubble up to the default
         // system behavior (probably exit the activity)
-        return super.onKeyDown(keyCode, event);
+        return super.onKeyUp(keyCode, event);
     }
     @Override
     public boolean onKeyLongPress(int keyCode, KeyEvent event) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 95985be..283f964 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
         android:layout_marginStart="10dp"
         android:layout_marginEnd="1dp"
         android:layout_marginBottom="262dp"
-        android:hint="bookwyrm.social"
+        android:hint="e.g. bookwyrm.social"
         android:inputType="text"
         android:minHeight="48dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -162,4 +162,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000..7596d46
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" path="."/>
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" path="."/>
+    </device-transfer>
+</data-extraction-rules>
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
new file mode 100644
index 0000000..b7be748
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -0,0 +1,5 @@
+* Fixed some log-in problems.
+* Changed colour of warning text to be better visible.
+* Disabled inclusion of dependencies info and VCS info, fixing build problems for F-Droid.
+* Long-press now actually works.
+* Other minor changes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
index 2666ce5..0a4a883 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ