diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart
index b1bc842..a7d7b43 100644
--- a/lib/views/homeserver_picker.dart
+++ b/lib/views/homeserver_picker.dart
@@ -30,12 +30,6 @@ class HomeserverPicker extends StatelessWidget {
       homeserver = 'https://$homeserver';
     }
 
-    // removes trailing spaces and slash from url if present (api errors on it)
-    homeserver = homeserver.trim();
-    if (homeserver.endsWith('/')) {
-      homeserver = homeserver.substring(0, homeserver.length - 1);
-    }
-
     final success = await SimpleDialogs(context).tryRequestWithLoadingDialog(
         Matrix.of(context).client.checkServer(homeserver));
     if (success != false) {
diff --git a/lib/views/login.dart b/lib/views/login.dart
index 40903c2..d7d327a 100644
--- a/lib/views/login.dart
+++ b/lib/views/login.dart
@@ -131,7 +131,6 @@ class _LoginState extends State<Login> {
                 readOnly: loading,
                 autocorrect: false,
                 autofocus: true,
-                keyboardType: TextInputType.emailAddress,
                 onChanged: (t) => _checkWellKnownWithCoolDown(t, context),
                 controller: usernameController,
                 decoration: InputDecoration(