diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html b/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html
index 2760a107..b9343d92 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html
@@ -29,7 +29,13 @@
 			<div class="card-body">
 				<h5 class="card-title">Already registered</h5>
 				<p class="card-text" th:inline="text">
-					Hello '<span sec:authentication="principal.email" id="current_user"></span>', you are already registered as <span sec:authentication="principal.authorities"></span>
+					Hello <b sec:authentication="principal.email" id="current_user"></b>,<br />
+					<span sec:authorize="hasRole('ROLE_OPENORGS_ADMIN') or hasRole('ROLE_OPENORGS_NATIONAL_ADMIN') or hasRole('ROLE_OPENORGS_USER')">
+						You are already registered.
+					</span>
+					<span sec:authorize="hasRole('ROLE_OPENORGS_PENDING')">
+						Your registration need to be approved by an administrator. Please wait.
+					</span>
 				</p>	
 			</div>
 		</div>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/main.html b/apps/dnet-orgs-database-application/src/main/resources/templates/main.html
index bb24817a..52e5a9ba 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/templates/main.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/templates/main.html
@@ -112,7 +112,10 @@ fieldset > legend        { font-size      : 1.2rem !important; }
 					<div class="dropdown-menu dropdown-menu-right">
 						<p class="px-4 pt-2 text-muted small">
 							<b>Logged as:</b><br /><span sec:authentication="principal.email" id="current_user"></span><br />
-							<b>Role:</b><br /><span sec:authentication="principal.authorities"></span>
+							<b>Role:</b><br />
+							<span sec:authorize="hasRole('ROLE_OPENORGS_ADMIN')">Super Admin</span>
+							<span sec:authorize="hasRole('ROLE_OPENORGS_NATIONAL_ADMIN')">National Admin</span>
+							<span sec:authorize="hasRole('ROLE_OPENORGS_USER')">Simple User</span>
 						</p>
 						<div class="dropdown-divider"></div>
 						<a class="dropdown-item" th:href="@{/logout}">Logout</a>