diff --git a/poetry.lock b/poetry.lock
index 5fba1b224..f7d90f86f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.3.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.4.3 and should not be changed by hand.
 
 [[package]]
 name = "asgiref"
@@ -684,8 +684,8 @@ files = [
 google-auth = ">=2.14.1,<3.0.dev0"
 googleapis-common-protos = ">=1.56.2,<2.0.dev0"
 proto-plus = [
-    {version = ">=1.25.0,<2.0.0.dev0", markers = "python_version >= \"3.13\""},
     {version = ">=1.22.3,<2.0.0.dev0", markers = "python_version < \"3.13\""},
+    {version = ">=1.25.0,<2.0.0.dev0", markers = "python_version >= \"3.13\""},
 ]
 protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0.dev0"
 requests = ">=2.18.0,<3.0.0.dev0"
@@ -1317,6 +1317,24 @@ files = [
     {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"},
 ]
 
+[[package]]
+name = "pyjwt"
+version = "2.13.0"
+description = "JSON Web Token implementation in Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "pyjwt-2.13.0-py3-none-any.whl", hash = "sha256:66adcc2aff09b3f1bbd95fc1e1577df8ac8723c978552fd43304c8a290ac5728"},
+    {file = "pyjwt-2.13.0.tar.gz", hash = "sha256:41571c89ca91598c79e8ef18a2d07367d4810fbbd6f637794879baf1b7703423"},
+]
+
+[package.dependencies]
+typing_extensions = {version = ">=4.0", markers = "python_version < \"3.11\""}
+
+[package.extras]
+crypto = ["cryptography (>=3.4.0)"]
+
 [[package]]
 name = "pyopenssl"
 version = "25.0.0"
@@ -1951,4 +1969,4 @@ brotli = ["brotli"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.10"
-content-hash = "637c808ca7e717a872f26b077fadf360e774dccb1b2944f66ee1c8ce2c5ec656"
+content-hash = "f30ab3336495c6158fd82fe6a6402f1ed4a04984b77e75c99c55058d0e8a812a"
diff --git a/poetry.toml b/poetry.toml
index 084377a03..3b549d6c8 100644
--- a/poetry.toml
+++ b/poetry.toml
@@ -1,2 +1,2 @@
 [virtualenvs]
-create = false
+create = true
diff --git a/pyproject.toml b/pyproject.toml
index fde77eafb..e217e82b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,7 @@ django-redis = "^5.4.0"
 redis = "^6.4.0"
 mysqlclient = "^2.2.4"
 psutil = "^7.1.3"
+pyjwt = "^2.13.0"
 
 [tool.poetry.group.dev.dependencies]
 djlint = "^1.34.1"
diff --git a/web/settings.py b/web/settings.py
index 4ddcae8bb..e3cbcdc60 100644
--- a/web/settings.py
+++ b/web/settings.py
@@ -142,6 +142,8 @@
     "channels",
     "allauth",
     "allauth.account",
+    "allauth.socialaccount",
+    "allauth.socialaccount.providers.google",
     "captcha",
     "markdownx",
     "web",
diff --git a/web/templates/account/login.html b/web/templates/account/login.html
index 38ac4da1e..4e7028d98 100644
--- a/web/templates/account/login.html
+++ b/web/templates/account/login.html
@@ -1,7 +1,7 @@
 {% extends "allauth/layouts/base.html" %}
 
 {% load static %}
-{% load account %}
+{% load account socialaccount %}
 
 {% block extra_head %}
   {{ block.super }}
@@ -87,6 +87,27 @@ <h2 class="mt-10 text-center text-2xl font-bold leading-9 tracking-tight text-gr
           </button>
         </div>
       </form>
+
+      <div class="mt-6">
+        <div class="relative">
+          <div class="absolute inset-0 flex items-center">
+            <div class="w-full border-t border-gray-300 dark:border-gray-600"></div>
+          </div>
+          <div class="relative flex justify-center text-sm">
+            <span class="bg-white dark:bg-gray-800 px-2 text-gray-500 dark:text-gray-400">
+              Or continue with
+            </span>
+          </div>
+        </div>
+
+        <a href="{% provider_login_url 'google' %}"
+          class="mt-6 flex w-full items-center justify-center rounded-md bg-white dark:bg-gray-700 px-4 py-2 text-base font-semibold leading-6 text-gray-900 dark:text-white shadow-sm ring-1 ring-inset ring-gray-300 dark:ring-gray-600 hover:bg-gray-50 dark:hover:bg-gray-600">
+          <i class="fab fa-google mr-2 text-sm text-red-500" aria-hidden="true"></i>
+          Continue with Google
+        </a>
+      </div>
+
+
       <p class="mt-10 text-center text-sm text-gray-500 dark:text-gray-400">
         Don't have an account?
         <a href="{% url 'account_signup' %}"
diff --git a/web/templates/account/signup.html b/web/templates/account/signup.html
index 7720a6a97..0e4415526 100644
--- a/web/templates/account/signup.html
+++ b/web/templates/account/signup.html
@@ -2,6 +2,8 @@
 
 {% load static %}
 
+{% load account socialaccount %}
+
 {% block extra_head %}
   {{ block.super }}
   <style>
@@ -249,6 +251,27 @@ <h2 class="text-xl font-bold text-gray-900 dark:text-white flex items-center jus
           </a>
         </p>
       </form>
+
+      <div class="mt-6">
+        <div class="relative">
+          <div class="absolute inset-0 flex items-center">
+            <div class="w-full border-t border-gray-300 dark:border-gray-600"></div>
+          </div>
+          <div class="relative flex justify-center text-sm">
+            <span class="bg-white dark:bg-gray-800 px-2 text-gray-500 dark:text-gray-400">
+              Or continue with
+            </span>
+          </div>
+        </div>
+
+        <a href="{% provider_login_url 'google' %}"
+          class="mt-6 flex w-full items-center justify-center rounded-md bg-white dark:bg-gray-700 px-4 py-2 text-base font-semibold leading-6 text-gray-900 dark:text-white shadow-sm ring-1 ring-inset ring-gray-300 dark:ring-gray-600 hover:bg-gray-50 dark:hover:bg-gray-600">
+          <i class="fab fa-google mr-2 text-sm text-red-500" aria-hidden="true"></i>
+          Continue with Google
+        </a>
+      </div>
+
+
     </div>
   </div>
 {% endblock content %}
diff --git a/web/templates/base.html b/web/templates/base.html
index 7afa700a9..850da8790 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -855,33 +855,70 @@
         </div>
       </div>
     </header>
-    {% if messages %}
-      <div class="fixed left-1/2 transform -translate-x-1/2 top-20 z-50 w-full max-w-lg space-y-2">
-        {% for message in messages %}
-          <div class="flex items-center p-4 rounded-lg shadow-lg {% if message.tags == 'error' %}bg-red-100 dark:bg-red-900 text-red-700 dark:text-red-200{% elif message.tags == 'success' %}bg-green-100 dark:bg-green-900 text-green-700 dark:text-green-200{% elif message.tags == 'warning' %}bg-yellow-100 dark:bg-yellow-900 text-yellow-700 dark:text-yellow-200{% else %}bg-blue-100 dark:bg-blue-900 text-blue-700 dark:text-blue-200{% endif %}">
-            <div class="mr-3">
-              {% if message.tags == 'error' %}
-                <i class="fas fa-exclamation-circle"></i>
-              {% elif message.tags == 'success' %}
-                <i class="fas fa-check-circle"></i>
-              {% elif message.tags == 'warning' %}
-                <i class="fas fa-exclamation-triangle"></i>
-              {% else %}
-                <i class="fas fa-info-circle"></i>
-              {% endif %}
-            </div>
-            <p class="flex-1">{{ message }}</p>
-            <button type="button" class="ml-auto" onclick="this.parentElement.remove()">
-              <i class="fas fa-times"></i>
-            </button>
-          </div>
-        {% endfor %}
+
+
+  
+{% if messages %}
+  <div class="fixed left-1/2 transform -translate-x-1/2 top-20 z-50 w-full max-w-lg space-y-2">
+    {% for message in messages %}
+      <div class="django-message flex items-center p-4 rounded-lg shadow-lg transition-all duration-500 ease-in-out {% if message.tags == 'error' %}bg-red-100 dark:bg-red-900 text-red-700 dark:text-red-200{% elif message.tags == 'success' %}bg-green-100 dark:bg-green-900 text-green-700 dark:text-green-200{% elif message.tags == 'warning' %}bg-yellow-100 dark:bg-yellow-900 text-yellow-700 dark:text-yellow-200{% else %}bg-blue-100 dark:bg-blue-900 text-blue-700 dark:text-blue-200{% endif %}">
+        
+        <div class="mr-3">
+          {% if message.tags == 'error' %}
+            <i class="fas fa-exclamation-circle"></i>
+          {% elif message.tags == 'success' %}
+            <i class="fas fa-check-circle"></i>
+          {% elif message.tags == 'warning' %}
+            <i class="fas fa-exclamation-triangle"></i>
+          {% else %}
+            <i class="fas fa-info-circle"></i>
+          {% endif %}
+        </div>
+
+        <p class="flex-1">{{ message }}</p>
+
+        <button type="button" class="ml-auto" onclick="removeMessage(this.parentElement)">
+          <i class="fas fa-times"></i>
+        </button>
+
       </div>
-    {% endif %}
-    {% block extra_body %}
-      {% block content %}
-      {% endblock content %}
-    {% endblock extra_body %}
+    {% endfor %}
+  </div>
+{% endif %}
+
+<style>
+  .django-message {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  .django-message.hide {
+    opacity: 0;
+    transform: translateY(-10px);
+  }
+</style>
+
+<script>
+  function removeMessage(message) {
+    message.classList.add('hide');
+
+    setTimeout(function () {
+      message.remove();
+    }, 500);
+  }
+
+  setTimeout(function () {
+    document.querySelectorAll('.django-message').forEach(function (message) {
+      removeMessage(message);
+    });
+  }, 3000);
+</script>
+
+{% block extra_body %}
+  {% block content %}
+  {% endblock content %}
+{% endblock extra_body %}
+
     <!-- FOOTER -->
     <footer class="bg-white dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 mt-auto">
       <div class="max-w-[90rem] mx-auto px-4 md:px-6 py-12">