diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
index 348c1e5e6e36a..7fff5e646b2a4 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
@@ -296,9 +296,10 @@ private void getMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
         if (securityIndex.isAvailable()) {
             loadMappings(listener);
         } else {
+            logger.info("The security index is not yet available - no role mappings can be loaded");
             if (logger.isDebugEnabled()) {
                 logger.debug(
-                    "The security index is not yet available - no role mappings can be loaded. index [{}] [exists: {}] [available: {}]",
+                    "Security Index [{}] [exists: {}] [available: {}]",
                     SECURITY_MAIN_ALIAS,
                     securityIndex.indexExists(),
                     securityIndex.isAvailable()
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
index 1de6ce7eed4fd..048dd2fd7a925 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
@@ -137,7 +137,7 @@ public ElasticsearchException getUnavailableReason() {
         } else if (state.indexExists()) {
             return new UnavailableShardsException(
                 null,
-                "index [" + state.concreteIndexName + "] exists but at least one shard is unavailable"
+                "at least one primary shard for the index [" + state.concreteIndexName + "] is unavailable"
             );
         } else {
             return new IndexNotFoundException(state.concreteIndexName);