diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e6961d782..a5f12e646 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,7 +17,7 @@ spring.servlet.multipart.max-file-size=2000MB
 spring.servlet.multipart.max-request-size=2000MB
 
 server.servlet.session.tracking-modes=cookie
-server.servlet.context-path=/pdf
+server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
 
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html
index 6d2127d03..d291a4a9f 100644
--- a/src/main/resources/templates/addUsers.html
+++ b/src/main/resources/templates/addUsers.html
@@ -34,7 +34,7 @@
                     <td th:text="#{${user.roleName}}"></td>
                     <td>
                       <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post">
-                        <button type="submit" th:text="#{delete}">Delete</button>
+                        <button class="btn btn-danger" type="submit" th:text="#{delete}">Delete</button>
                       </form>
                     </td>
                     <td th:text="${user.authenticationType}"></td>