diff --git a/lib/ui/auth/login_vm.dart b/lib/ui/auth/login_vm.dart
index 94e85fcdc..cc406e592 100644
--- a/lib/ui/auth/login_vm.dart
+++ b/lib/ui/auth/login_vm.dart
@@ -123,8 +123,7 @@ class LoginVM {
                   completer: completer,
                   idToken: value.idToken,
                   accessToken: value.accessToken,
-                  serverAuthCode: account
-                      .displayName, // TODO fix this once PR is merged https://github.com/flutter/plugins/pull/2116
+                  serverAuthCode: value.serverAuthCode,
                   url: formatApiUrl(url.trim()),
                   secret: secret.trim(),
                   platform: getPlatform(context),
@@ -149,8 +148,7 @@ class LoginVM {
                   completer: completer,
                   idToken: value.idToken,
                   accessToken: value.accessToken,
-                  serverAuthCode: account
-                      .displayName, // TODO fix this once PR is merged https://github.com/flutter/plugins/pull/2116
+                  serverAuthCode: value.serverAuthCode,
                 ));
                 completer.future.then((_) => _handleLogin(context));
               });
@@ -198,9 +196,6 @@ class LoginVM {
             url: formatApiUrl(url.trim()),
             secret: secret.trim(),
           ));
-          completer.future.then((_) {
-            // do nothing
-          });
         },
         onLoginPressed: (
           BuildContext context,
diff --git a/pubspec.lock b/pubspec.lock
index b8e9dca5f..bf2e17e46 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.10"
+    version: "0.39.11"
   archive:
     dependency: transitive
     description:
@@ -421,12 +421,10 @@ packages:
   google_sign_in:
     dependency: "direct main"
     description:
-      path: "packages/google_sign_in/google_sign_in"
-      ref: HEAD
-      resolved-ref: "8b4e1efa0b03db4e88d958829931cdd17c8e48fd"
-      url: "git://github.com/hillelcoren/plugins.git"
-    source: git
-    version: "4.4.6"
+      name: google_sign_in
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.5.1"
   google_sign_in_platform_interface:
     dependency: transitive
     description:
@@ -489,7 +487,7 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.7+2"
+    version: "0.6.7+3"
   image_picker_platform_interface:
     dependency: transitive
     description:
@@ -650,7 +648,7 @@ packages:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+1"
+    version: "0.0.1+2"
   path_provider_macos:
     dependency: transitive
     description:
@@ -928,7 +926,7 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.1"
+    version: "1.15.2"
   test_api:
     dependency: transitive
     description:
@@ -942,7 +940,7 @@ packages:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.9"
+    version: "0.3.10"
   timeago:
     dependency: "direct main"
     description:
@@ -991,21 +989,21 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.1+6"
+    version: "0.1.2"
   usage:
     dependency: transitive
     description:
       name: usage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.4.1"
+    version: "3.4.2"
   uuid:
     dependency: transitive
     description:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   vector_math:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 01b4de512..08e021f7c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,11 +30,7 @@ dependencies:
   flutter_slidable: ^0.5.4
   charts_flutter: ^0.8.1
   firebase_auth: ^0.15.4
-  #google_sign_in: ^4.1.4
-  google_sign_in:
-    git:
-      url: git://github.com/hillelcoren/plugins.git
-      path: packages/google_sign_in/google_sign_in
+  google_sign_in: ^4.5.1
   local_auth: ^0.6.1+3
   sentry: ^3.0.1
   image_picker: ^0.6.3+4