diff --git a/src/app/components/login/forgot-pw/forgot-pw.component.html b/src/app/components/login/forgot-pw/forgot-pw.component.html
index ca22e2d..0521ebc 100644
--- a/src/app/components/login/forgot-pw/forgot-pw.component.html
+++ b/src/app/components/login/forgot-pw/forgot-pw.component.html
@@ -43,11 +43,7 @@
           } @else { @if (mail.touched &&
           !checkIfUserEmailIsValid(pwResetData.mail.toLowerCase())) {
           <p>{{ "register.errorMail1" | translate }}</p>
-          } @else {
-          @if(existEmailonServer(pwResetData.mail.toLowerCase()).length !== 1 &&
-          mail.touched) {
-          <p>{{ "register.errorMail3" | translate }}</p>
-          } } }
+          } }
         </div>
       </div>
       <div class="notice">
diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts
index 42082a1..35ee6c5 100644
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -49,7 +49,6 @@ export class LoginService {
         }
       })
       .catch((error) => {
-        console.error(error);
         this.errorCode = error.code;
         this.sharedService.isBtnDisabled = false;
       });
@@ -93,7 +92,7 @@ export class LoginService {
         this.createUserInFirestore(userDataToSave);
       })
       .catch((error) => {
-        console.error(error);
+        this.sharedService.isBtnDisabled = false;
       });
   }
 
@@ -130,14 +129,11 @@ export class LoginService {
         });
       })
       .catch((error) => {
-        console.error('Google login error:', error);
         this.sharedService.isBtnDisabled = false;
       });
   }
 
   async createUserInFirestore(user: User) {
-    console.log(user);
-
     const userDataToSave: User = {
       uId: user.uId,
       email: user.email,
@@ -170,8 +166,6 @@ export class LoginService {
     await updateDoc(doc(collection(this.firestore, 'users'), userId), {
       status: status,
       lastLogin: new Date().getTime(),
-    }).catch((err) => {
-      console.error(err);
     });
     window.location.reload();
   }
@@ -214,8 +208,6 @@ export class LoginService {
         this.sharedService.isBtnDisabled = false;
       })
       .catch((error) => {
-        const errorCode = error.code;
-        const errorMessage = error.message;
         this.sharedService.isBtnDisabled = false;
       });
   }
@@ -228,7 +220,6 @@ export class LoginService {
         this.sharedService.isBtnDisabled = false;
       })
       .catch((error) => {
-        console.error('Fehler beim Zurücksetzen des Passworts:', error);
         this.sharedService.isBtnDisabled = false;
       });
   }