diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1787794..6ea7d1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 0.12.4 - 2020-04-17
+### Fixed
+- Login without google services
+
 # Version 0.12.2 - 2020-04-12
 ### Changes:
 - New set homeserver UX
diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart
index 530dec5..2481e8c 100644
--- a/lib/components/matrix.dart
+++ b/lib/components/matrix.dart
@@ -155,7 +155,11 @@ class MatrixState extends State<Matrix> {
       token = null;
     }
     if (token?.isEmpty ?? true) {
-      showToast(I18n.of(context).noGoogleServicesWarning);
+      showToast(
+        I18n.of(context).noGoogleServicesWarning,
+        duration: Duration(seconds: 15),
+      );
+      return;
     }
     await client.setPushers(
       token,
diff --git a/lib/main.dart b/lib/main.dart
index 09424e3..c5d89e8 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -30,6 +30,7 @@ class App extends StatelessWidget {
         builder: (BuildContext context) => ThemeSwitcherWidget(
           child: Builder(
             builder: (BuildContext context) => StyledToast(
+              duration: Duration(seconds: 5),
               child: MaterialApp(
                 title: 'FluffyChat',
                 theme: ThemeSwitcherWidget.of(context).themeData,
diff --git a/pubspec.yaml b/pubspec.yaml
index 2df3eff..30072cd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Chat with your friends.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.12.3+35
+version: 0.12.4+36
 
 environment:
   sdk: ">=2.6.0 <3.0.0"