diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Procedures.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Procedures.java
index 2bfe9474dbe45..de41b2704f6bc 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Procedures.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/Procedures.java
@@ -160,7 +160,12 @@ public void registerProcedure( Class<?> proc, boolean overrideCurrentImplementat
      * @param overrideCurrentImplementation set to true if procedures within this class should override older procedures with the same name
      * @param warning the warning the procedure should generate when called
      */
-    public void registerProcedure( Class<?> proc, boolean overrideCurrentImplementation, Optional<String> warning )
+    public void registerProcedure( Class<?> proc, boolean overrideCurrentImplementation, String warning ) throws KernelException
+    {
+        registerProcedure( proc, overrideCurrentImplementation, Optional.of( warning ) );
+    }
+
+    private void registerProcedure( Class<?> proc, boolean overrideCurrentImplementation, Optional<String> warning )
             throws
             KernelException
     {
diff --git a/community/kernel/src/main/java/org/neo4j/procedure/Context.java b/community/kernel/src/main/java/org/neo4j/procedure/Context.java
index 233d69b2e354e..782a1fdec4a81 100644
--- a/community/kernel/src/main/java/org/neo4j/procedure/Context.java
+++ b/community/kernel/src/main/java/org/neo4j/procedure/Context.java
@@ -29,8 +29,8 @@
  * Practically, this means that before the procedure is called, fields with this annotation are automatically
  * populated with implementations of the specified APIs.
  *
- * In fact, apart from static fields, <i>only</i> fields with this annotation are allowed in classses that
- * define procedure. Each of the fields must be public and non-final.
+ * In fact, apart from static fields, <i>only</i> fields with this annotation are allowed in classes that
+ * define procedures. Each of the fields must be public and non-final.
  *
  * @see Procedure
  */
diff --git a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityModule.java b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityModule.java
index 0b34016849bd9..adb45e73b7afa 100644
--- a/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityModule.java
+++ b/enterprise/security/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityModule.java
@@ -29,7 +29,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -112,8 +111,7 @@ public void setup( Dependencies dependencies ) throws KernelException
                     ctx -> authManager.getUserManager( ctx.get( SECURITY_CONTEXT ).subject(), ctx.get( SECURITY_CONTEXT ).isAdmin() ), true );
             if ( config.get( SecuritySettings.auth_providers ).size() > 1 )
             {
-                procedures.registerProcedure( UserManagementProcedures.class, true,
-                        Optional.of( "%s only applies to native users." ) );
+                procedures.registerProcedure( UserManagementProcedures.class, true, "%s only applies to native users."  );
             }
             else
             {