Fix NPE on User Properties screen

src/web/user-properties.jsp

@@ -301,8 +301,9 @@
 </table>
 </div>
 
-<br>
-<div class="jive-table">
+<% if (user != null) { %>
+    <br>
+    <div class="jive-table">
         <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <thead>
                 <tr>
@@ -318,17 +319,19 @@
                 <% } %>
             </tbody>
         </table>
-</div>
+    </div>
 
-<br><br>
 
-<% if (user != null && !UserManager.getUserProvider().isReadOnly()) { %>
+    <% if (!UserManager.getUserProvider().isReadOnly()) { %>
 
-<form action="user-edit-form.jsp">
-<input type="hidden" name="username" value="<%= StringUtils.escapeForXML(user.getUsername()) %>">
-<input type="submit" value="<fmt:message key="global.edit_properties" />">
-</form>
+        <br><br>
 
+        <form action="user-edit-form.jsp">
+        <input type="hidden" name="username" value="<%= StringUtils.escapeForXML(user.getUsername()) %>">
+        <input type="submit" value="<fmt:message key="global.edit_properties" />">
+        </form>
+
+    <% } %>
 <% } %>
 
 </body>