diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue
index b7823a1a78..9720cdd866 100644
--- a/website/client/src/components/appFooter.vue
+++ b/website/client/src/components/appFooter.vue
@@ -303,6 +303,7 @@
             ></div>
           </div>
         </div>
+  
         <div
           v-if="TIME_TRAVEL_ENABLED && user?.permissions?.fullAccess"
           :key="lastTimeJump"
@@ -342,6 +343,7 @@
             @click="jumpTime(30)"
           >+30 Days</a>
         </div>
+  
         <div
           v-if="DEBUG_ENABLED && isUserLoaded"
           class="debug-toggle"
@@ -708,7 +710,7 @@ h3 {
 
   footer {
     padding: 24px 16px;
-
+    
     .columns {
       column-gap: 1.5rem;
       display: grid !important;
diff --git a/website/server/libs/auth/social.js b/website/server/libs/auth/social.js
index a6101378d5..d234ec632e 100644
--- a/website/server/libs/auth/social.js
+++ b/website/server/libs/auth/social.js
@@ -98,6 +98,11 @@ export async function loginSocial (req, res) { // eslint-disable-line import/pre
     throw new NotFound(res.t('userNotFound'));
   }
 
+  let sanitizedUsername = username.replace(/[^a-zA-Z0-9_-]/g, '');
+  if (!sanitizedUsername) {
+    sanitizedUsername = generateUsername();
+  }
+
   if (existingUser) {
     existingUser.auth[network] = {
       id: profile.id,
@@ -112,8 +117,8 @@ export async function loginSocial (req, res) { // eslint-disable-line import/pre
           emails: profile.emails,
         },
         local: {
-          username,
-          lowerCaseUsername: username.toLowerCase(),
+          username: sanitizedUsername,
+          lowerCaseUsername: sanitizedUsername.toLowerCase(),
           email,
         },
       },