diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/error/error.component.ts b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/error/error.component.ts
index 9f3a2175..7862d709 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/error/error.component.ts
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/console/pages/error/error.component.ts
@@ -63,7 +63,7 @@ export class ErrorComponent implements OnInit {
 			[NavigationErrorReason.INVALID_ROOM_SECRET]: {
 				title: 'Invalid link',
 				message:
-					'The link you used to access this room is not valid. Please ask the moderator to share the correct link using the share buttons available in the room'
+					'The link you used to access this room is not valid. Please ask a moderator to share the correct link using the share buttons available in the room'
 			},
 			[NavigationErrorReason.INVALID_RECORDING_SECRET]: {
 				title: 'Invalid link',
@@ -102,28 +102,29 @@ export class ErrorComponent implements OnInit {
 	}
 
 	/**
-	 * Sets the back button text based on the application mode and user role
+	 * Sets the back button text based on the application mode and user authentication
 	 */
 	async setBackButtonText() {
 		const isStandaloneMode = this.appCtxService.isStandaloneMode();
 		const redirection = this.navService.getLeaveRedirectURL();
-		const isAdmin = await this.authService.isAdmin();
+		const isAuthenticated = await this.authService.isUserAuthenticated();
 
-		if (isStandaloneMode && !redirection && !isAdmin) {
-			// If in standalone mode, no redirection URL and not an admin, hide the back button
+		// If in standalone mode without redirection and user is not authenticated,
+		// hide back button (user has no where to go back to)
+		if (isStandaloneMode && !redirection && !isAuthenticated) {
 			this.showBackButton = false;
 			return;
 		}
 
 		this.showBackButton = true;
-		this.backButtonText = isStandaloneMode && !redirection && isAdmin ? 'Back to Console' : 'Accept';
+		this.backButtonText = isStandaloneMode && !redirection && isAuthenticated ? 'Back to Console' : 'Accept';
 	}
 
 	/**
 	 * Handles the back button click event and navigates accordingly
 	 * If in embedded mode, it closes the WebComponentManagerService
 	 * If the redirect URL is set, it navigates to that URL
-	 * If in standalone mode without a redirect URL, it navigates to the admin console
+	 * If in standalone mode without a redirect URL, it navigates to the console
 	 */
 	async goBack() {
 		if (this.appCtxService.isEmbeddedMode()) {
@@ -138,7 +139,7 @@ export class ErrorComponent implements OnInit {
 		}
 
 		if (this.appCtxService.isStandaloneMode()) {
-			// Navigate to the admin console
+			// Navigate to the console
 			await this.navService.navigateTo('/overview', undefined, true);
 		}
 	}
diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/pages/end-meeting/end-meeting.component.ts b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/pages/end-meeting/end-meeting.component.ts
index 98a80844..bc5c584e 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/pages/end-meeting/end-meeting.component.ts
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/pages/end-meeting/end-meeting.component.ts
@@ -89,28 +89,29 @@ export class EndMeetingComponent implements OnInit {
 	}
 
 	/**
-	 * Sets the back button text based on the application mode and user role
+	 * Sets the back button text based on the application mode and user authentication
 	 */
 	private async setBackButtonText() {
 		const isStandaloneMode = this.appCtxService.isStandaloneMode();
 		const redirection = this.navService.getLeaveRedirectURL();
-		const isAdmin = await this.authService.isAdmin();
+		const isAuthenticated = await this.authService.isUserAuthenticated();
 
-		if (isStandaloneMode && !redirection && !isAdmin) {
-			// If in standalone mode, no redirection URL and not an admin, hide the back button
+		// If in standalone mode without redirection and user is not authenticated,
+		// hide back button (user has no where to go back to)
+		if (isStandaloneMode && !redirection && !isAuthenticated) {
 			this.showBackButton = false;
 			return;
 		}
 
 		this.showBackButton = true;
-		this.backButtonText = isStandaloneMode && !redirection && isAdmin ? 'Back to Console' : 'Accept';
+		this.backButtonText = isStandaloneMode && !redirection && isAuthenticated ? 'Back to Rooms' : 'Accept';
 	}
 
 	/**
 	 * Handles the back button click event and navigates accordingly
 	 * If in embedded mode, it closes the WebComponentManagerService
 	 * If the redirect URL is set, it navigates to that URL
-	 * If in standalone mode without a redirect URL, it navigates to the admin console
+	 * If in standalone mode without a redirect URL, it navigates to the rooms page
 	 */
 	async goBack() {
 		if (this.appCtxService.isEmbeddedMode()) {
@@ -125,8 +126,8 @@ export class EndMeetingComponent implements OnInit {
 		}
 
 		if (this.appCtxService.isStandaloneMode()) {
-			// Navigate to the admin console
-			await this.navService.navigateTo('/overview', undefined, true);
+			// Navigate to the rooms page
+			await this.navService.navigateTo('/rooms', undefined, true);
 		}
 	}
 }
diff --git a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/services/meeting-lobby.service.ts b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/services/meeting-lobby.service.ts
index 7df0fa22..514f5d26 100644
--- a/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/services/meeting-lobby.service.ts
+++ b/meet-ce/frontend/projects/shared-meet-components/src/lib/domains/meeting/services/meeting-lobby.service.ts
@@ -266,19 +266,21 @@ export class MeetingLobbyService {
 	}
 
 	/**
-	 * Sets the back button text based on the application mode and user role
+	 * Sets the back button text based on the application mode and user authentication
 	 */
 	protected async setBackButtonText(): Promise<void> {
 		const isStandaloneMode = this.appCtxService.isStandaloneMode();
 		const redirection = this.navigationService.getLeaveRedirectURL();
-		const isAdmin = await this.authService.isAdmin();
+		const isAuthenticated = await this.authService.isUserAuthenticated();
 
-		if (isStandaloneMode && !redirection && !isAdmin) {
+		// If in standalone mode without redirection and user is not authenticated,
+		// hide back button (user has no where to go back to)
+		if (isStandaloneMode && !redirection && !isAuthenticated) {
 			this._state.update((state) => ({ ...state, showBackButton: false }));
 			return;
 		}
 
-		const backButtonText = isStandaloneMode && !redirection && isAdmin ? 'Back to Rooms' : 'Back';
+		const backButtonText = isStandaloneMode && !redirection && isAuthenticated ? 'Back to Rooms' : 'Back';
 		this._state.update((state) => ({ ...state, showBackButton: true, backButtonText }));
 	}