diff --git a/pointercrate-user-pages/src/account/profile.rs b/pointercrate-user-pages/src/account/profile.rs
index 3897b733..e804f516 100644
--- a/pointercrate-user-pages/src/account/profile.rs
+++ b/pointercrate-user-pages/src/account/profile.rs
@@ -5,7 +5,6 @@ use pointercrate_core::{
     permission::PermissionsManager,
     trp,
 };
-use pointercrate_core_pages::head::Script;
 use pointercrate_user::{
     auth::{AuthenticatedUser, NonMutating},
     config,
@@ -24,14 +23,6 @@ impl AccountPageTab for ProfileTab {
         "/static/user/js/account/profile.js".into()
     }
 
-    fn additional_scripts(&self) -> Vec<Script> {
-        if cfg!(feature = "oauth2") {
-            vec![Script::r#async("https://accounts.google.com/gsi/client")]
-        } else {
-            Vec::new()
-        }
-    }
-
     fn tab_id(&self) -> u8 {
         1
     }
@@ -147,7 +138,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" 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 2bae470d..f3a6e302 100644
--- a/pointercrate-user-pages/src/login.rs
+++ b/pointercrate-user-pages/src/login.rs
@@ -4,7 +4,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!",
     )
@@ -12,13 +12,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");
-    }
-
-    frag
+    .body(login_page_body())
 }
 
 fn login_page_body() -> Markup {
@@ -43,7 +37,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" 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 37d8ee62..069851d8 100644
--- a/pointercrate-user-pages/src/register.rs
+++ b/pointercrate-user-pages/src/register.rs
@@ -6,18 +6,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");
-    }
-
-    frag
+        .body(register_page_body())
 }
 
 fn register_page_body() -> Markup {
@@ -41,7 +35,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" style="margin: 10px 0px" {}
                         @if cfg!(feature = "legacy_accounts") {
                             p.or style="text-size: small; margin: 0px" { (tr("login.methods-separator")) }