diff --git a/src/api/web.rs b/src/api/web.rs
index ce633e860e..d4a7f4ccc5 100644
--- a/src/api/web.rs
+++ b/src/api/web.rs
@@ -54,7 +54,7 @@ fn not_found() -> ApiResult<Html<String>> {
 
 #[get("/css/vaultwarden.css")]
 fn vaultwarden_css() -> Cached<Css<String>> {
-    // Configure the web-vault version as an integer so it can be used as a comparison large or grarter then.
+    // Configure the web-vault version as an integer so it can be used as a comparison smaller or greater then.
     // The default is based upon the version since this feature is added.
     static WEB_VAULT_VERSION: Lazy<u32> = Lazy::new(|| {
         let re = regex::Regex::new(r"(\d{4})\.(\d{1,2})\.(\d{1,2})").unwrap();
@@ -66,25 +66,67 @@ fn vaultwarden_css() -> Cached<Css<String>> {
                 c.get(2).unwrap().as_str().parse().unwrap(),
                 c.get(3).unwrap().as_str().parse().unwrap(),
             ),
-            _ => (2024, 6, 1),
+            _ => (2024, 6, 2),
+        };
+        format!("{major}{minor:02}{patch:02}").parse::<u32>().unwrap()
+    });
+
+    // Configure the Vaultwarden version as an integer so it can be used as a comparison smaller or greater then.
+    // The default is based upon the version since this feature is added.
+    static VW_VERSION: Lazy<u32> = Lazy::new(|| {
+        let re = regex::Regex::new(r"(\d{1})\.(\d{1,2})\.(\d{1,2})").unwrap();
+        let vw_version = crate::VERSION.unwrap_or("1.32.0");
+
+        let (major, minor, patch) = match re.captures(vw_version) {
+            Some(c) if c.len() == 4 => (
+                c.get(1).unwrap().as_str().parse().unwrap(),
+                c.get(2).unwrap().as_str().parse().unwrap(),
+                c.get(3).unwrap().as_str().parse().unwrap(),
+            ),
+            _ => (1, 32, 0),
         };
         format!("{major}{minor:02}{patch:02}").parse::<u32>().unwrap()
     });
 
     let css_options = json!({
         "web_vault_version": *WEB_VAULT_VERSION,
+        "vw_version": *VW_VERSION,
         "signup_disabled": !CONFIG.signups_allowed() && CONFIG.signups_domains_whitelist().is_empty(),
         "mail_enabled": CONFIG.mail_enabled(),
         "yubico_enabled": CONFIG._enable_yubico() && (CONFIG.yubico_client_id().is_some() == CONFIG.yubico_secret_key().is_some()),
         "emergency_access_allowed": CONFIG.emergency_access_allowed(),
         "sends_allowed": CONFIG.sends_allowed(),
     });
-    let scss = CONFIG.render_template("scss/vaultwarden.scss", &css_options).expect("Rendered scss/vaultwarden.scss");
-    let css = grass_compiler::from_string(
+
+    let scss = match CONFIG.render_template("scss/vaultwarden.scss", &css_options) {
+        Ok(t) => t,
+        Err(e) => {
+            // Something went wrong loading the template. Fallback to the built-in templates
+            warn!("Loading scss/vaultwarden.scss.hbs or scss/user.vaultwarden.scss.hbs failed. {e}");
+            CONFIG
+                .render_inner_template("scss/vaultwarden.scss", &css_options)
+                .expect("Inner scss/vaultwarden.scss.hbs to render")
+        }
+    };
+
+    let css = match grass_compiler::from_string(
         scss,
         &grass_compiler::Options::default().style(grass_compiler::OutputStyle::Compressed),
-    )
-    .expect("scss/vaultwarden.scss to compile");
+    ) {
+        Ok(css) => css,
+        Err(e) => {
+            // Something went wrong compiling the scss. Fallback to the built-in tempaltes
+            warn!("Compiling the Vaultwarden SCSS styles failed. {e}");
+            let scss = CONFIG
+                .render_inner_template("scss/vaultwarden.scss", &css_options)
+                .expect("Inner scss/vaultwarden.scss.hbs to render");
+            grass_compiler::from_string(
+                scss,
+                &grass_compiler::Options::default().style(grass_compiler::OutputStyle::Compressed),
+            )
+            .expect("SCSS to compile")
+        }
+    };
 
     // Cache for one day should be enough and not too much
     Cached::ttl(Css(css), 86_400, false)
diff --git a/src/config.rs b/src/config.rs
index 0352cc72e8..adda7fd17a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1262,11 +1262,16 @@ impl Config {
             let hb = load_templates(CONFIG.templates_folder());
             hb.render(name, data).map_err(Into::into)
         } else {
-            let hb = &CONFIG.inner.read().unwrap().templates;
-            hb.render(name, data).map_err(Into::into)
+            self.render_inner_template(name, data)
         }
     }
 
+    #[inline]
+    pub fn render_inner_template<T: serde::ser::Serialize>(&self, name: &str, data: &T) -> Result<String, Error> {
+        let hb = &self.inner.read().unwrap().templates;
+        hb.render(name, data).map_err(Into::into)
+    }
+
     pub fn set_rocket_shutdown_handle(&self, handle: rocket::Shutdown) {
         self.inner.write().unwrap().rocket_shutdown_handle = Some(handle);
     }