diff --git a/src/api.tsx b/src/api.tsx
index c5a631d..245d96e 100644
--- a/src/api.tsx
+++ b/src/api.tsx
@@ -8,7 +8,9 @@ api.interceptors.request.use(
 	(config) => {
 		const token = localStorage.getItem('token');
 		if (token) {
-			config.headers.Authorization = `Bearer ${token}`;
+			config.headers['Authorization'] = `Bearer ${token}`;
+			config.headers['Accept'] = 'application/json';
+			config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
 		}
 		return config;
 	},
@@ -18,6 +20,9 @@ api.interceptors.request.use(
 api.interceptors.response.use(
 	(response) => response,
 	async (error) => {
+		if (error.response.config.url.includes('/auth/login') || error.response.config.url.includes('/auth/register')) {
+			return Promise.reject(error);
+		}
 		const originalRequest = error.config;
 
 		// If the error status is 401 and there is no originalRequest._retry flag,
@@ -26,22 +31,15 @@ api.interceptors.response.use(
 			originalRequest._retry = true;
 		}
 
-		try {
-			const refreshToken = localStorage.getItem('refreshToken');
-			if (!refreshToken) return;
-			const response = await api.post('/auth/token/refresh', { refresh: refreshToken });
-			const token = response.data.access;
-
-			localStorage.setItem('token', token);
-
-			originalRequest.headers.Authorization = `Bearer ${token}`;
-			return axios(originalRequest);
-		} catch (error: unknown) {
-			if (axios.isAxiosError(error) && error.response?.status === 401) {
-				localStorage.removeItem('refreshToken');
-				localStorage.removeItem('token');
-			}
-		}
+		const refreshToken = localStorage.getItem('refreshToken');
+		if (!refreshToken) return;
+
+		const response = await api.post('/auth/token/refresh', { refresh: refreshToken });
+		const token = response.data.access;
+
+		localStorage.setItem('token', token);
+
+		return axios(originalRequest);
 	}
 );
 
diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index 791594b..c7fa852 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -60,19 +60,7 @@ export const AuthProvider = ({ children }: Props) => {
 
 	const register = async (userData: RegistrationUserData) => {
 		try {
-			const response = await AuthService.handleRegister(userData);
-
-			if (response.status !== 201) {
-				return {
-					message: 'Something wrong happened.',
-					error: true,
-					status: 400,
-				};
-			}
-
-			// Login user after registration
-			const { email, password } = userData;
-			login({ email, password });
+			await AuthService.handleRegister(userData);
 
 			return {
 				message: 'Your account was successfully created!',
@@ -87,8 +75,12 @@ export const AuthProvider = ({ children }: Props) => {
 					status: 400,
 				};
 			}
+			return {
+				message: ['An error ocurred. We are sorry for the inconvenience.'],
+				error: true,
+				status: 400,
+			};
 		}
-		return {} as ResponseData;
 	};
 
 	const logout = () => {
diff --git a/src/services/AuthService.tsx b/src/services/AuthService.tsx
index aeb448f..73ffac4 100644
--- a/src/services/AuthService.tsx
+++ b/src/services/AuthService.tsx
@@ -9,8 +9,6 @@ class AuthService {
 
 	public handleLogin = async (userData: LoginUserData) => {
 		const response = await api.post('/auth/token/', userData, { headers: AuthService.jsonHeaders });
-		const { access } = response.data;
-		api.defaults.headers.common['Authorization'] = 'Bearer ' + access;
 		return response;
 	};