dependency updates

data-service/pom.xml

@@ -140,12 +140,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>3.8</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

docker/pom.xml

@@ -20,18 +20,6 @@
         <project.root.basedir>${project.basedir}/..</project.root.basedir>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>skip-docker</id>
-            <properties>
-                <skipDocker>true</skipDocker>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>

onejar/pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <project.root.basedir>${project.basedir}/..</project.root.basedir>
-        <tomcat.version>9.0.10</tomcat.version>
+        <tomcat.version>9.0.11</tomcat.version>
         <jetty-version>9.4.11.v20180605</jetty-version>
     </properties>
 

pom.xml

@@ -188,7 +188,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.11</version>
+                        <version>8.12</version>
                     </dependency>
                 </dependencies>
                 <executions>

rest-test-server/pom.xml

@@ -0,0 +1,65 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.pwm-project</groupId>
+    <artifactId>pwm-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>PWM Password Self Service</name>
+
+    <licenses>
+        <license>
+            <name>The GNU General Public License (GPL) Version 2</name>
+            <url>http://www.gnu.org/licenses/gpl-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>PWM Project</name>
+        <url>http://www.pwm-project.org</url>
+    </organization>
+
+    <properties>
+        <warArtifactID>pwm-${project.version}.war</warArtifactID>
+        <build.number>0</build.number>  <!-- default in case not set on command line -->
+        <build.revision>0</build.revision>  <!-- default in case not set on command line -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <pwm.minimum.maven.version>3.2</pwm.minimum.maven.version>
+        <timestamp.iso>${maven.build.timestamp}</timestamp.iso>
+    </properties>
+
+    <modules>
+        <module>client</module>
+        <module>server</module>
+        <module>onejar</module>
+        <module>docker</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>${pwm.minimum.maven.version}</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

server/pom.xml

@@ -19,37 +19,6 @@
         <skipTests>false</skipTests>
     </properties>
 
-    <profiles>
-        <profile>
-            <!-- Builds a zip file containing the built war file, along with the supplemental directory -->
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.6</version>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../webapp/src/build/assembly/release-bundle.xml</descriptor>
-                            </descriptors>
-                            <finalName>${project.build.finalName}-${timestamp.iso}</finalName>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-release-bundle</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <!--
@@ -393,7 +362,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>3.8</version>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
@@ -403,7 +372,7 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

server/src/main/java/password/pwm/util/cli/MainClass.java

@@ -495,8 +495,7 @@ public class MainClass
 
         if ( runningMode != mode )
         {
-            out( "unable to start application in required state '" + mode + "', current state: " + runningMode );
-            System.exit( -1 );
+            out( "application is in non running state: " + runningMode );
         }
 
         return pwmApplication;

webapp/src/build/assembly/release-bundle.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Password Management Servlets (PWM)
-  ~ Copyright (c) 2006-2009 Novell, Inc.
-  ~ Copyright (c) 2009-2018 The PWM Project
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-
-    <id>release-bundle</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <files>
-        <file>
-            <source>target/${project.build.finalName}.war</source>
-            <destName>pwm.war</destName>
-        </file>
-        <file>
-            <source>${project.basedir}/../LICENSE</source>
-        </file>
-        <file>
-            <source>${project.basedir}/pom.xml</source>
-        </file>
-    </files>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src</directory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/supplemental</directory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>

webapp/src/main/webapp/private/index.jsp

@@ -38,160 +38,174 @@
     </jsp:include>
 
     <div id="centerbody" class="tile-centerbody">
-        <pwm:if test="<%=PwmIfTest.endUserFunctionalityAvailable%>" negate="true">
-            <p><pwm:display key="Warning_NoEndUserModules" bundle="Config"/></p>
-            <br/>
-        </pwm:if>
-        <pwm:if test="<%=PwmIfTest.endUserFunctionalityAvailable%>">
-            <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.CHANGE_PASSWORD%>">
-                <a id="button_ChangePassword" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PrivateChangePassword.servletUrl()%>'/>">
-                    <div class="tile">
-                        <div class="tile-content">
-                            <div class="tile-image password-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_ChangePassword'/>"><pwm:display key="Title_ChangePassword"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_ChangePassword'/>"><pwm:display key="Long_Title_ChangePassword"/></div>
-                        </div>
-                    </div>
-                </a>
+        <div>
+            <pwm:if test="<%=PwmIfTest.endUserFunctionalityAvailable%>" negate="true">
+                <p><pwm:display key="Warning_NoEndUserModules" bundle="Config"/></p>
+                <br/>
             </pwm:if>
-
-            <pwm:if test="<%=PwmIfTest.peopleSearchEnabled%>">
-                <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PEOPLE_SEARCH%>">
-                    <a id="button_PeopleSearch" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PrivatePeopleSearch.servletUrl()%>'/>#/search">
+            <pwm:if test="<%=PwmIfTest.endUserFunctionalityAvailable%>">
+                <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.CHANGE_PASSWORD%>">
+                    <a id="button_ChangePassword" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PrivateChangePassword.servletUrl()%>'/>">
                         <div class="tile">
                             <div class="tile-content">
-                                <div class="tile-image search-image"></div>
-                                <div class="tile-title" title="<pwm:display key='Title_PeopleSearch'/>"><pwm:display key="Title_PeopleSearch"/></div>
-                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_PeopleSearch'/>"><pwm:display key="Long_Title_PeopleSearch"/></div>
+                                <div class="tile-image password-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_ChangePassword'/>"><pwm:display key="Title_ChangePassword"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_ChangePassword'/>"><pwm:display key="Long_Title_ChangePassword"/></div>
                             </div>
                         </div>
                     </a>
                 </pwm:if>
-            </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.orgChartEnabled%>">
-                <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PEOPLE_SEARCH%>">
-                    <a id="button_PeopleSearch" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PrivatePeopleSearch.servletUrl()%>'/>#/orgchart">
+                <pwm:if test="<%=PwmIfTest.peopleSearchEnabled%>">
+                    <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PEOPLE_SEARCH%>">
+                        <a id="button_PeopleSearch" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PrivatePeopleSearch.servletUrl()%>'/>#/search">
+                            <div class="tile">
+                                <div class="tile-content">
+                                    <div class="tile-image search-image"></div>
+                                    <div class="tile-title" title="<pwm:display key='Title_PeopleSearch'/>"><pwm:display key="Title_PeopleSearch"/></div>
+                                    <div class="tile-subtitle" title="<pwm:display key='Long_Title_PeopleSearch'/>"><pwm:display key="Long_Title_PeopleSearch"/></div>
+                                </div>
+                            </div>
+                        </a>
+                    </pwm:if>
+                </pwm:if>
+
+                <pwm:if test="<%=PwmIfTest.orgChartEnabled%>">
+                    <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PEOPLE_SEARCH%>">
+                        <a id="button_PeopleSearch" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PrivatePeopleSearch.servletUrl()%>'/>#/orgchart">
+                            <div class="tile">
+                                <div class="tile-content">
+                                    <div class="tile-image orgchart-image"></div>
+                                    <div class="tile-title" title="<pwm:display key='Title_OrgChart'/>"><pwm:display key="Title_OrgChart"/></div>
+                                    <div class="tile-subtitle" title="<pwm:display key='Title_OrgChart'/>"><pwm:display key="Title_OrgChart"/></div>
+                                </div>
+                            </div>
+                        </a>
+                    </pwm:if>
+                </pwm:if>
+
+                <pwm:if test="<%=PwmIfTest.setupChallengeEnabled%>">
+                    <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.SETUP_RESPONSE%>">
+                        <a id="button_SetupResponses" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SetupResponses.servletUrl()%>'/>">
+                            <div class="tile">
+                                <div class="tile-content">
+                                    <div class="tile-image security-image"></div>
+                                    <div class="tile-title" title="<pwm:display key='Title_SetupResponses'/>"><pwm:display key="Title_SetupResponses"/></div>
+                                    <div class="tile-subtitle" title="<pwm:display key='Long_Title_SetupResponses'/>"><pwm:display key="Long_Title_SetupResponses"/></div>
+                                </div>
+                            </div>
+                        </a>
+                    </pwm:if>
+                </pwm:if>
+
+                <pwm:if test="<%=PwmIfTest.otpSetupEnabled%>">
+                    <a id="button_SetupOtpSecret" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SetupOtp.servletUrl()%>'/>">
                         <div class="tile">
                             <div class="tile-content">
-                                <div class="tile-image orgchart-image"></div>
-                                <div class="tile-title" title="<pwm:display key='Title_OrgChart'/>"><pwm:display key="Title_OrgChart"/></div>
-                                <div class="tile-subtitle" title="<pwm:display key='Title_OrgChart'/>"><pwm:display key="Title_OrgChart"/></div>
+                                <div class="tile-image mobile-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_SetupOtpSecret'/>"><pwm:display key="Title_SetupOtpSecret"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_SetupOtpSecret'/>"><pwm:display key="Long_Title_SetupOtpSecret"/></div>
                             </div>
                         </div>
                     </a>
                 </pwm:if>
-            </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.setupChallengeEnabled%>">
-                <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.SETUP_RESPONSE%>">
-                    <a id="button_SetupResponses" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SetupResponses.servletUrl()%>'/>">
+                <pwm:if test="<%=PwmIfTest.updateProfileAvailable%>">
+                    <a id="button_UpdateProfile" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.UpdateProfile.servletUrl()%>'/>">
                         <div class="tile">
                             <div class="tile-content">
-                                <div class="tile-image security-image"></div>
-                                <div class="tile-title" title="<pwm:display key='Title_SetupResponses'/>"><pwm:display key="Title_SetupResponses"/></div>
-                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_SetupResponses'/>"><pwm:display key="Long_Title_SetupResponses"/></div>
+                                <div class="tile-image profile-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_UpdateProfile'/>"><pwm:display key="Title_UpdateProfile"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_UpdateProfile'/>"><pwm:display key="Long_Title_UpdateProfile"/></div>
                             </div>
                         </div>
                     </a>
                 </pwm:if>
-            </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.otpSetupEnabled%>">
-                <a id="button_SetupOtpSecret" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SetupOtp.servletUrl()%>'/>">
-                    <div class="tile">
-                        <div class="tile-content">
-                            <div class="tile-image mobile-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_SetupOtpSecret'/>"><pwm:display key="Title_SetupOtpSecret"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_SetupOtpSecret'/>"><pwm:display key="Long_Title_SetupOtpSecret"/></div>
+                <pwm:if test="<%=PwmIfTest.shortcutsEnabled%>">
+                    <a id="button_Shortcuts" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.Shortcuts.servletUrl()%>'/>">
+                        <div class="tile">
+                            <div class="tile-content">
+                                <div class="tile-image shortcut-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_Shortcuts'/>"><pwm:display key="Title_Shortcuts"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_Shortcuts'/>"><pwm:display key="Long_Title_Shortcuts"/></div>
+                            </div>
                         </div>
-                    </div>
-                </a>
-            </pwm:if>
+                    </a>
+                </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.updateProfileAvailable%>">
-                <a id="button_UpdateProfile" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.UpdateProfile.servletUrl()%>'/>">
-                    <div class="tile">
-                        <div class="tile-content">
-                            <div class="tile-image profile-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_UpdateProfile'/>"><pwm:display key="Title_UpdateProfile"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_UpdateProfile'/>"><pwm:display key="Long_Title_UpdateProfile"/></div>
+                <pwm:if test="<%=PwmIfTest.accountInfoEnabled%>">
+                    <a id="button_UserInformation" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.AccountInformation.servletUrl()%>'/>">
+                        <div class="tile">
+                            <div class="tile-content">
+                                <div class="tile-image user-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_UserInformation'/>"><pwm:display key="Title_UserInformation"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_UserInformation'/>"><pwm:display key="Long_Title_UserInformation"/></div>
+                            </div>
                         </div>
-                    </div>
-                </a>
-            </pwm:if>
+                    </a>
+                </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.shortcutsEnabled%>">
-                <a id="button_Shortcuts" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.Shortcuts.servletUrl()%>'/>">
-                    <div class="tile">
-                        <div class="tile-content">
-                            <div class="tile-image shortcut-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_Shortcuts'/>"><pwm:display key="Title_Shortcuts"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_Shortcuts'/>"><pwm:display key="Long_Title_Shortcuts"/></div>
+                <pwm:if test="<%=PwmIfTest.helpdeskAvailable%>">
+                    <a id="button_Helpdesk" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.Helpdesk.servletUrl()%>'/>">
+                        <div class="tile">
+                            <div class="tile-content">
+                                <div class="tile-image support-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_Helpdesk'/>"><pwm:display key="Title_Helpdesk"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_Helpdesk'/>"><pwm:display key="Long_Title_Helpdesk"/></div>
+                            </div>
                         </div>
-                    </div>
-                </a>
-            </pwm:if>
+                    </a>
+                </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.accountInfoEnabled%>">
-                <a id="button_UserInformation" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.AccountInformation.servletUrl()%>'/>">
-                    <div class="tile">
-                        <div class="tile-content">
-                            <div class="tile-image user-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_UserInformation'/>"><pwm:display key="Title_UserInformation"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_UserInformation'/>"><pwm:display key="Long_Title_UserInformation"/></div>
+
+                <pwm:if test="<%=PwmIfTest.DeleteAccountAvailable%>">
+                    <a id="button_Helpdesk" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SelfDelete.servletUrl()%>'/>">
+                        <div class="tile">
+                            <div class="tile-content">
+                                <div class="tile-image selfdelete-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_DeleteAccount'/>"><pwm:display key="Title_DeleteAccount"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_DeleteAccount'/>"><pwm:display key="Long_Title_DeleteAccount"/></div>
+                            </div>
                         </div>
-                    </div>
-                </a>
-            </pwm:if>
+                    </a>
+                </pwm:if>
 
-            <pwm:if test="<%=PwmIfTest.helpdeskAvailable%>">
-                <a id="button_Helpdesk" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.Helpdesk.servletUrl()%>'/>">
-                    <div class="tile">
-                        <div class="tile-content">
-                            <div class="tile-image support-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_Helpdesk'/>"><pwm:display key="Title_Helpdesk"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_Helpdesk'/>"><pwm:display key="Long_Title_Helpdesk"/></div>
+                <pwm:if test="<%=PwmIfTest.guestRegistrationAvailable%>">
+                    <a id="button_GuestRegistration" href="<pwm:url url='<%=PwmServletDefinition.GuestRegistration.servletUrl()%>' addContext="true"/>">
+                        <div class="tile">
+                            <div class="tile-content">
+                                <div class="tile-image guest-image"></div>
+                                <div class="tile-title" title="<pwm:display key='Title_GuestRegistration'/>"><pwm:display key="Title_GuestRegistration"/></div>
+                                <div class="tile-subtitle" title="<pwm:display key='Long_Title_GuestRegistration'/>"><pwm:display key="Long_Title_GuestRegistration"/></div>
+                            </div>
                         </div>
-                    </div>
-                </a>
+                    </a>
+                </pwm:if>
             </pwm:if>
-
-
-            <pwm:if test="<%=PwmIfTest.DeleteAccountAvailable%>">
-                <a id="button_Helpdesk" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SelfDelete.servletUrl()%>'/>">
+        </div>
+        <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PWMADMIN%>">
+            <div>
+                <h2 style="padding-top: 20px"><pwm:display key="Title_Admin"/></h2>
+                <a id="button_Admin_Dashboard" href="<pwm:url url='<%=PwmServletDefinition.Admin.servletUrl()%>' addContext="true"/> ">
                     <div class="tile">
                         <div class="tile-content">
-                            <div class="tile-image selfdelete-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_DeleteAccount'/>"><pwm:display key="Title_DeleteAccount"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_DeleteAccount'/>"><pwm:display key="Long_Title_DeleteAccount"/></div>
+                            <div class="tile-image admin-image"></div>
+                            <div class="tile-title" title="<pwm:display key='Title_Admin'/>"><pwm:display key="Title_Admin"/></div>
+                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_Admin'/>"><pwm:display key="Long_Title_Admin"/></div>
                         </div>
                     </div>
                 </a>
-            </pwm:if>
-
-            <pwm:if test="<%=PwmIfTest.guestRegistrationAvailable%>">
-                <a id="button_GuestRegistration" href="<pwm:url url='<%=PwmServletDefinition.GuestRegistration.servletUrl()%>' addContext="true"/>">
+                <a id="button_Admin" href="<pwm:url url='<%=PwmServletDefinition.Admin.servletUrl()%>' addContext="true"/> ">
                     <div class="tile">
                         <div class="tile-content">
-                            <div class="tile-image guest-image"></div>
-                            <div class="tile-title" title="<pwm:display key='Title_GuestRegistration'/>"><pwm:display key="Title_GuestRegistration"/></div>
-                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_GuestRegistration'/>"><pwm:display key="Long_Title_GuestRegistration"/></div>
+                            <div class="tile-image admin-image"></div>
+                            <div class="tile-title" title="<pwm:display key='Title_Admin'/>"><pwm:display key="Title_Admin"/></div>
+                            <div class="tile-subtitle" title="<pwm:display key='Long_Title_Admin'/>"><pwm:display key="Long_Title_Admin"/></div>
                         </div>
                     </div>
                 </a>
-            </pwm:if>
-        </pwm:if>
-        <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PWMADMIN%>">
-            <a id="button_Admin" href="<pwm:url url='<%=PwmServletDefinition.Admin.servletUrl()%>' addContext="true"/> ">
-                <div class="tile">
-                    <div class="tile-content">
-                        <div class="tile-image admin-image"></div>
-                        <div class="tile-title" title="<pwm:display key='Title_Admin'/>"><pwm:display key="Title_Admin"/></div>
-                        <div class="tile-subtitle" title="<pwm:display key='Long_Title_Admin'/>"><pwm:display key="Long_Title_Admin"/></div>
-                    </div>
-                </div>
-            </a>
+            </div>
         </pwm:if>
     </div>
     <div class="push"></div>