diff --git a/scheduleManagement/templates/account/login.html b/scheduleManagement/templates/account/login.html
index 22e9398..ca636e1 100644
--- a/scheduleManagement/templates/account/login.html
+++ b/scheduleManagement/templates/account/login.html
@@ -1,27 +1,21 @@
+{% load socialaccount %}
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Sign In</title>
+    {% block title %} <title>Sign In</title> {% endblock %}
 </head>
 <body>
-    <title>Sign In</title>
-
-    <h1>Sign in</h1>    
-    
-    <p>Still don't have an account, then please <a href="{{ signup_url }}">sign up</a></p>
-    
-    {% url 'account_login' as login_url %}
-    
-    <form method="post">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <button type="submit">Login</button>
-    </form>
-    
-    {% load socialaccount %}
-    
-    <a href="{% provider_login_url 'google'%}">Login with google</a>
+    {% block content %}
+        <h1>Sign in</h1>
+        
+        <p>Still don't have an account, then please <a href="{{ signup_url }}">sign up</a></p>
+        
+        {% include "partials/form_component.html" with value="Login" %}
+        
+        <a href="{% provider_login_url 'google'%}">Login with google</a>
+    {% endblock %}
 </body>
 </html>
diff --git a/scheduleManagement/templates/account/logout.html b/scheduleManagement/templates/account/logout.html
index c142f08..12f3149 100644
--- a/scheduleManagement/templates/account/logout.html
+++ b/scheduleManagement/templates/account/logout.html
@@ -1,17 +1,10 @@
-<!DOCTYPE html>
-<html lang="pt-br">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Logout</title>
-</head>
-<body>
+{% extends 'account/login.html' %}
+
+{% block title %} <title>Logout</title> {% endblock %}
+
+{% block content %}
     <h1>Logout</h1>
     <p>Are you sure that you want to logout of <strong>{{ user.username }}</strong></p>
-    <form method="post">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <button>Continue</button>
-    </form>
-</body>
-</html>
\ No newline at end of file
+
+    {% include "partials/form_component.html" with value="Continue" %}
+{% endblock %}
diff --git a/scheduleManagement/templates/confirm-delete.html b/scheduleManagement/templates/confirm-delete.html
index 24ce0bc..b4ba792 100644
--- a/scheduleManagement/templates/confirm-delete.html
+++ b/scheduleManagement/templates/confirm-delete.html
@@ -7,5 +7,5 @@ <h1>{{ object_type | capfirst }} | Delete</h1>
 
   <p>Are you sure you want to delete <strong>{{ object }}?</strong></p>
 
-  {% include 'partials/form_component.html' with value="Yes, i'm sure" delete=true %}
+  {% include "partials/form_component.html" with value="Yes, i'm sure" delete=true %}
 {% endblock %}
diff --git a/scheduleManagement/templates/socialaccount/login.html b/scheduleManagement/templates/socialaccount/login.html
index b317d74..675efbd 100644
--- a/scheduleManagement/templates/socialaccount/login.html
+++ b/scheduleManagement/templates/socialaccount/login.html
@@ -1,17 +1,10 @@
-<!DOCTYPE html>
-<html lang="pt-br">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Sign in via google</title>
-</head>
-<body>
+{% extends 'account/login.html' %}
+
+{% block title %} <title>Sign in via google</title> {% endblock %}
+
+{% block content %}
     <h1>Sign via google</h1>
-    <p>You area about to sign with a third-party environment</p>
-    <form method="post">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <button>Continue</button>
-    </form>
-</body>
-</html>
\ No newline at end of file
+    <p>You are about to sign with a third-party environment</p>
+    
+    {% include "partials/form_component.html" with value="Continue" %}
+{% endblock %}
