diff --git a/pointercrate-user-pages/src/account/profile.rs b/pointercrate-user-pages/src/account/profile.rs
index bb4b9651..1ce8ba94 100644
--- a/pointercrate-user-pages/src/account/profile.rs
+++ b/pointercrate-user-pages/src/account/profile.rs
@@ -6,7 +6,6 @@ use pointercrate_core::{
     theme::task_theme,
     trp,
 };
-use pointercrate_core_pages::head::Script;
 use pointercrate_user::{
     auth::{AuthenticatedUser, NonMutating},
     config,
@@ -151,7 +150,7 @@ impl AccountPageTab for ProfileTab {
                             data-client_id=(config::google_client_id())
                             data-callback="googleOauthCallback" {}
 
-                        script src=(format!("https://accounts.google.com/gsi/client?hl={}", &lang)) async {}
+                        script src=(format!("https://accounts.google.com/gsi/client?hl={}", &lang)) defer {}
                         div .g_id_signin data-text="continue_with" data-theme=(task_theme().as_gsi_theme()) style="margin: 10px 0px" data-locale=(lang) {}
                         p.error #g-signin-error style="text-align: left" {}
                     }
diff --git a/pointercrate-user-pages/src/login.rs b/pointercrate-user-pages/src/login.rs
index cff7a166..ff81ff65 100644
--- a/pointercrate-user-pages/src/login.rs
+++ b/pointercrate-user-pages/src/login.rs
@@ -7,7 +7,7 @@ use pointercrate_core_pages::{head::HeadLike, trp_html, PageFragment};
 use pointercrate_user::config;
 
 pub fn login_page() -> PageFragment {
-    let mut frag = PageFragment::new(
+    PageFragment::new(
         "Pointercrate - Login",
         "Log in to an existing pointercrate account or register for a new one!",
     )
@@ -15,15 +15,7 @@ pub fn login_page() -> PageFragment {
     .module("/static/core/js/modules/form.js")
     .module("/static/core/js/modules/tab.js")
     .stylesheet("/static/user/css/login.css")
-    .body(login_page_body());
-
-    if cfg!(feature = "oauth2") {
-        frag = frag
-            .async_script("https://accounts.google.com/gsi/client")
-            .module("/static/user/js/gsi-theme.js");
-    }
-
-    frag
+    .body(login_page_body())
 }
 
 fn login_page_body() -> Markup {
@@ -48,7 +40,7 @@ fn login_page_body() -> Markup {
                             data-client_id=(config::google_client_id())
                             data-callback="googleOauthCallback" {}
 
-                        script src=(format!("https://accounts.google.com/gsi/client?hl={}", &lang)) async {}
+                        script src=(format!("https://accounts.google.com/gsi/client?hl={}", &lang)) defer {}
                         div .g_id_signin data-text="continue_with" data-theme=(task_theme().as_gsi_theme()) style="margin: 10px 0px" data-locale=(lang) {}
                         p.error #g-signin-error style="text-align: left" {}
 
diff --git a/pointercrate-user-pages/src/register.rs b/pointercrate-user-pages/src/register.rs
index 21e91744..86dd2641 100644
--- a/pointercrate-user-pages/src/register.rs
+++ b/pointercrate-user-pages/src/register.rs
@@ -7,20 +7,12 @@ use pointercrate_core_pages::{trp_html, PageFragment};
 use pointercrate_user::config;
 
 pub fn registration_page() -> PageFragment {
-    let mut frag = PageFragment::new("Pointercrate - Registration", "Register for a new pointercrate account!")
+    PageFragment::new("Pointercrate - Registration", "Register for a new pointercrate account!")
         .module("/static/user/js/register.js")
         .module("/static/core/js/modules/form.js")
         .module("/static/core/js/modules/tab.js")
         .stylesheet("/static/user/css/login.css")
-        .body(register_page_body());
-
-    if cfg!(feature = "oauth2") {
-        frag = frag
-            .async_script("https://accounts.google.com/gsi/client")
-            .module("/static/user/js/gsi-theme.js");
-    }
-
-    frag
+        .body(register_page_body())
 }
 
 fn register_page_body() -> Markup {
@@ -44,7 +36,7 @@ fn register_page_body() -> Markup {
                             data-client_id=(config::google_client_id())
                             data-callback="googleOauthRegisterCallback" {}
 
-                        script src=(format!("https://accounts.google.com/gsi/client?hl={}", &lang)) async {}
+                        script src=(format!("https://accounts.google.com/gsi/client?hl={}", &lang)) defer {}
                         div .g_id_signin data-text="signup_with" data-theme=(task_theme().as_gsi_theme()) style="margin: 10px 0px" {}
                         @if cfg!(feature = "legacy_accounts") {
                             p.or style="text-size: small; margin: 0px" { (tr("login.methods-separator")) }