diff --git a/src/app/components/contacts/contact-detail/contact-detail.component.html b/src/app/components/contacts/contact-detail/contact-detail.component.html
index 9f57c0b..d525a45 100644
--- a/src/app/components/contacts/contact-detail/contact-detail.component.html
+++ b/src/app/components/contacts/contact-detail/contact-detail.component.html
@@ -11,7 +11,8 @@
       src="./../../../../assets/img/arrow-left.svg"
     />
   </div>
-  @if (currentUserId) {
+  @if (currentUserId) { @for (user of checkUserData(currentUserId); track user)
+  {
   <div
     class="contact-details"
     [ngClass]="{
@@ -22,20 +23,22 @@
       <div
         class="circle"
         [ngStyle]="{
-          'background-color': firebaseService.getUserDetails(
-            currentUserId,
-            'color'
-          )
+          'background-color': user.color
         }"
       >
+        @if(user.status) {
+        <img src="./../../../assets/img/online.svg" alt="" />
+        } @else {
+        <img src="./../../../assets/img/offline.svg" alt="" />
+        }
         <div class="initials">
-          {{ firebaseService.getUserDetails(currentUserId, "initials") }}
+          {{ user.initials }}
         </div>
       </div>
       <div class="word-wrap">
         <div class="name">
-          {{ firebaseService.getUserDetails(currentUserId, "firstName") }}
-          {{ firebaseService.getUserDetails(currentUserId, "lastName") }}
+          {{ user.firstName }}
+          {{ user.lastName }}
         </div>
         <div class="btns">
           <div class="btn btn-edit">
@@ -56,26 +59,22 @@
       <div class="headline">Contact Information</div>
       <div class="info">
         <p>Email:</p>
-        <a
-          [href]="
-            'mail:' + firebaseService.getUserDetails(currentUserId, 'email')
-          "
-        >
-          {{ firebaseService.getUserDetails(currentUserId, "email") }}
+        <a [href]="'mail:' + user.email">
+          {{ user.email }}
         </a>
         <p>Phone:</p>
-        @if(firebaseService.getUserDetails(currentUserId, 'phone')[0] === '') {
+        @if(user.phone === '') {
         <span>no phone</span> } @else {
-        <a
-          [href]="
-            'tel:' + firebaseService.getUserDetails(currentUserId, 'phone')
-          "
-        >
-          <span>{{
-            firebaseService.getUserDetails(currentUserId, "phone")
-          }}</span>
+        <a [href]="'tel:' + user.phone">
+          <span>{{ user.phone }}</span>
         </a>
         }
+        <p>Last seen online:</p>
+        @if(user.status) {
+        <span>Currently online</span>
+        } @else {
+        <span>{{ convertTimestamp(user.lastLogin) }}</span>
+        }
       </div>
     </div>
   </div>
@@ -84,5 +83,5 @@
     [deleteContact]="deleteContact"
     [openEditDialog]="openEditDialog"
   ></app-contact-nav>
-  }
+  }}
 </section>
diff --git a/src/app/components/contacts/contact-detail/contact-detail.component.scss b/src/app/components/contacts/contact-detail/contact-detail.component.scss
index d974f55..e2fac36 100644
--- a/src/app/components/contacts/contact-detail/contact-detail.component.scss
+++ b/src/app/components/contacts/contact-detail/contact-detail.component.scss
@@ -48,6 +48,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  position: relative;
   width: 120px;
   min-width: 120px;
   height: 120px;
@@ -59,6 +60,13 @@
     color: var(--white);
     text-shadow: 1px 1px 2px var(--black);
   }
+  img {
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    bottom: 0;
+    right: 0;
+  }
 }
 
 .word-wrap {
diff --git a/src/app/components/contacts/contact-detail/contact-detail.component.ts b/src/app/components/contacts/contact-detail/contact-detail.component.ts
index 82306b6..cd7d11a 100644
--- a/src/app/components/contacts/contact-detail/contact-detail.component.ts
+++ b/src/app/components/contacts/contact-detail/contact-detail.component.ts
@@ -6,6 +6,7 @@ import { ContactEditComponent } from '../contact-edit/contact-edit.component';
 import { SharedService } from '../../../services/shared.service';
 import { ContactNavComponent } from '../contact-nav/contact-nav.component';
 import { FirebaseService } from '../../../services/firebase.service';
+import { LanguageService } from '../../../services/language.service';
 @Component({
   selector: 'app-contact-detail',
   standalone: true,
@@ -26,13 +27,20 @@ export class ContactDetailComponent {
   constructor(
     private router: Router,
     public sharedService: SharedService,
-    public firebaseService: FirebaseService
+    public firebaseService: FirebaseService,
+    private languageService: LanguageService
   ) {}
 
   closeUserDetails() {
     this.router.navigate(['contacts']);
   }
 
+  checkUserData(userId: string) {
+    return this.firebaseService
+      .getAllUsers()
+      .filter((user) => user.id === userId);
+  }
+
   toggleNav() {
     this.isMobileNavbarOpen = !this.isMobileNavbarOpen;
   }
@@ -47,6 +55,73 @@ export class ContactDetailComponent {
     this.sharedService.isDeleteContactDialogOpen = true;
   }
 
+  convertTimestamp(timestamp: number) {
+    const date = new Date(timestamp);
+    const monthsEN = [
+      'Jan',
+      'Feb',
+      'Mar',
+      'Apr',
+      'May',
+      'Jun',
+      'Jul',
+      'Aug',
+      'Sep',
+      'Oct',
+      'Nov',
+      'Dec',
+    ];
+    const monthsDE = [
+      'Jan',
+      'Feb',
+      'Mär',
+      'Apr',
+      'Mai',
+      'Jun',
+      'Jul',
+      'Aug',
+      'Sep',
+      'Okt',
+      'Nov',
+      'Dez',
+    ];
+    const months =
+      this.languageService.currentLang === 'de' ? monthsDE : monthsEN;
+    const year = date.getFullYear();
+    const month = months[date.getMonth()];
+    const day = date.getDate();
+
+    if (this.languageService.currentLang === 'de') {
+      const time = `${day}. ${month}. ${year}`;
+      return `${time} - ${this.convertTimestampHourDE(timestamp)}`;
+    } else {
+      const time = `${month}. ${day}, ${year}`;
+      return `${time} - ${this.convertTimestampHourEN(timestamp)}`;
+    }
+  }
+
+  convertTimestampHourEN(timestamp: number) {
+    const date = new Date(timestamp * 1000);
+    let hour = date.getHours();
+    const minute = ('0' + date.getMinutes()).slice(-2);
+    const second = ('0' + date.getMinutes()).slice(-2);
+    const period = hour >= 12 ? 'PM' : 'AM';
+    hour = hour % 12 || 12;
+
+    let hourWithNull = ('0' + hour).slice(-2);
+
+    return `${hourWithNull}:${minute}:${second} ${period}`;
+  }
+
+  convertTimestampHourDE(timestamp: number) {
+    const date = new Date(timestamp * 1000);
+    let hour = date.getHours();
+    const minute = ('0' + date.getMinutes()).slice(-2);
+    const second = ('0' + date.getMinutes()).slice(-2);
+
+    return `${hour}:${minute}:${second} Uhr`;
+  }
+
   @HostListener('document:click', ['$event'])
   checkOpenContactEdit(event: MouseEvent) {
     const targetElement = event.target as HTMLElement;
diff --git a/src/app/components/contacts/contacts.component.html b/src/app/components/contacts/contacts.component.html
index 5a1d667..b043c0c 100644
--- a/src/app/components/contacts/contacts.component.html
+++ b/src/app/components/contacts/contacts.component.html
@@ -28,25 +28,30 @@
         <div
           class="circle"
           [ngStyle]="{
-            'background-color': firebaseService.getUserDetails(user.id, 'color')
+            'background-color': user.color
           }"
         >
+          @if(user.status) {
+          <img src="./../../../assets/img/online.svg" alt="" />
+          } @else {
+          <img src="./../../../assets/img/offline.svg" alt="" />
+          }
           <div class="initials">
-            {{ firebaseService.getUserDetails(user.id, "initials") }}
+            {{ user.initials }}
           </div>
         </div>
         <div class="details">
           <div class="name">
             <p>
-              {{ firebaseService.getUserDetails(user.id, "firstName") }}
+              {{ user.firstName }}
             </p>
             <span>,&nbsp;</span>
             <p class="last-name">
-              {{ firebaseService.getUserDetails(user.id, "lastName") }}
+              {{ user.lastName }}
             </p>
           </div>
           <div class="email">
-            {{ firebaseService.getUserDetails(user.id, "email") }}
+            {{ user.email }}
           </div>
         </div>
       </div>
diff --git a/src/app/components/contacts/contacts.component.scss b/src/app/components/contacts/contacts.component.scss
index 965571e..8fa39e0 100644
--- a/src/app/components/contacts/contacts.component.scss
+++ b/src/app/components/contacts/contacts.component.scss
@@ -97,6 +97,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  position: relative;
   width: 42px;
   min-width: 42px;
   height: 42px;
@@ -108,6 +109,13 @@
     color: var(--white);
     text-shadow: 1px 1px 2px var(--black);
   }
+  img {
+    position: absolute;
+    width: 12px;
+    height: 12px;
+    bottom: 0;
+    right: 0;
+  }
 }
 
 .details {
diff --git a/src/app/interfaces/user.interface.ts b/src/app/interfaces/user.interface.ts
index e5f6a6f..1412e50 100644
--- a/src/app/interfaces/user.interface.ts
+++ b/src/app/interfaces/user.interface.ts
@@ -7,4 +7,6 @@ export interface User {
   phone: string;
   initials: string;
   color: string;
+  status: boolean;
+  lastLogin: number;
 }
diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts
index 61785f1..fa952e0 100644
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -6,7 +6,7 @@ import {
   GoogleAuthProvider,
 } from 'firebase/auth';
 import { FirebaseService } from './firebase.service';
-import { Firestore } from '@angular/fire/firestore';
+import { Firestore, collection, doc, updateDoc } from '@angular/fire/firestore';
 import { SharedService } from './shared.service';
 @Injectable({
   providedIn: 'root',
@@ -28,7 +28,9 @@ export class LoginService {
           this.getUserIdInLocalStorage(
             this.firebaseService.checkUserUID(user.uid)[0].id
           );
-          window.location.reload();
+          this.updateUserOnlineStatus(
+            this.firebaseService.checkUserUID(user.uid)[0].id
+          );
         } else {
           console.error('No user with this UID was found!');
         }
@@ -60,6 +62,16 @@ export class LoginService {
       });
   }
 
+  async updateUserOnlineStatus(userId: string) {
+    await updateDoc(doc(collection(this.firestore, 'users'), userId), {
+      status: true,
+      lastLogin: new Date().getTime(),
+    }).catch((err) => {
+      console.error(err);
+    });
+    window.location.reload();
+  }
+
   getUserIdInLocalStorage(userId: string) {
     localStorage.setItem('currentUser', JSON.stringify(userId));
   }
diff --git a/src/assets/img/offline.svg b/src/assets/img/offline.svg
new file mode 100644
index 0000000..d258d0f
--- /dev/null
+++ b/src/assets/img/offline.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="6.99976" cy="7" r="6" fill="#686868" stroke="white" stroke-width="2"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/img/online.svg b/src/assets/img/online.svg
new file mode 100644
index 0000000..e321565
--- /dev/null
+++ b/src/assets/img/online.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="6.99976" cy="7" r="6" fill="#92C83E" stroke="white" stroke-width="2"/>
+</svg>