diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index c3066dae99..14f2d69882 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1272,7 +1272,8 @@ new_user_step1_title=Step One - Person Properties
 new_user_step1_desc=Enter information about this person.
 new_user_step2_title=Step Two - User Properties
 new_user_step2_desc=Enter information about this user.
-new_user_finish_instruction=To add the user to this space click Finish. To review or change your selections click Back.
+new_user_finish_instruction=To add the user to the system click Finish. To review or change your selections click Back.
+new_user_finish_instruction_edit=To save the modifications to this user click Finish. To review or change your selections click Back.
 person_properties=Person Properties
 user_properties=User Properties
 first_name=First Name
@@ -1281,6 +1282,8 @@ email=Email
 company_id=Company ID
 home_space_location=Home Space Location
 home_space_name=Home Space Name
+presence_provider=Presence Provider
+presence_username=Presence Username
 
 # Trashcan messages
 title_deleted_items=Deleted Items
@@ -1412,24 +1415,24 @@ gettingstarted_onlinehelp=Online Help
 gettingstarted_onlinehelp_desc=Click the help icon to display Alfresco Help topics.
 
 # User Console and Settings messages
-title_user_console=User Options
+title_user_console=User Profile
 title_edit_user_details=Edit User Details
 user_console=User Options
 user_console_info=User Options
-user_console_description=Use this page to change your options and settings
+user_console_description=Use this page to change your profile and settings
 my_details=My Details
 general_pref=General Preferences
 change_my_password_description=Use this view to change your password
 change_my_password_instructions=Enter your new password.
 old_password=Old Password
 new_password=New Password
-edit_user_details=Edit User Details
+edit_user_details=Edit User Profile
 edit_user_details_description=Use this view to change your user details and email address
 start_location=Start Location
 interface_language=Interface Language
 content_language_filter=Content Language Filter
 content_all_languages=All Languages
-user_management=Management
+user_management=Tools
 
 # Delete Space Dialog messages
 select_delete_operation=What do you want to delete?
diff --git a/config/alfresco/web-client-config-wizards.xml b/config/alfresco/web-client-config-wizards.xml
index d1aad293df..a2c3e5e01c 100644
--- a/config/alfresco/web-client-config-wizards.xml
+++ b/config/alfresco/web-client-config-wizards.xml
@@ -693,9 +693,9 @@
 
 			<wizard name="editUser"
 				managed-bean="EditUserWizard"
-				title-id="new_user_title"
-				description-id="new_user_desc"
-				icon="/images/icons/new_user_large.gif">
+				title-id="new_user_title_edit"
+				description-id="new_user_desc_edit"
+				icon="/images/icons/edituser_large.gif">
 				<step name="person-properties"
 					title-id="person_properties"
 					description-id="new_user_step1_desc">
@@ -720,6 +720,7 @@
 						instruction-id="new_user_finish_instruction" />
 				</step>
 			</wizard>
+			
          <!--
          	Definition of the 2 steps edition wizard.
          	The first step is skiped to force the new edition to start with a translation selected by the user.
diff --git a/source/java/org/alfresco/web/bean/ajax/PickerBean.java b/source/java/org/alfresco/web/bean/ajax/PickerBean.java
index 079771e422..0430883dd6 100644
--- a/source/java/org/alfresco/web/bean/ajax/PickerBean.java
+++ b/source/java/org/alfresco/web/bean/ajax/PickerBean.java
@@ -58,6 +58,15 @@ import org.apache.commons.logging.LogFactory;
  */
 public class PickerBean
 {
+   private static final String ID_URL = "url";
+   private static final String ID_ICON = "icon";
+   private static final String ID_CHILDREN = "children";
+   private static final String ID_SELECTABLE = "selectable";
+   private static final String ID_ISROOT = "isroot";
+   private static final String ID_NAME = "name";
+   private static final String ID_ID = "id";
+   private static final String ID_PARENT = "parent";
+   
    private static final String FOLDER_IMAGE_PREFIX = "/images/icons/";
    
    private static Log logger = LogFactory.getLog(PickerBean.class);
@@ -115,7 +124,7 @@ public class PickerBean
          Collection<ChildAssociationRef> childRefs;
          NodeRef parentRef = null;
          Map params = fc.getExternalContext().getRequestParameterMap();
-         String strParentRef = (String)params.get("parent");
+         String strParentRef = (String)params.get(ID_PARENT);
          if (strParentRef == null || strParentRef.length() == 0)
          {
             childRefs = this.categoryService.getRootCategories(
@@ -133,30 +142,30 @@ public class PickerBean
          
          JSONWriter out = new JSONWriter(fc.getResponseWriter());
          out.startObject();
-         out.startValue("parent");
+         out.startValue(ID_PARENT);
          out.startObject();
          if (parentRef == null)
          {
-            out.writeNullValue("id");
-            out.writeValue("name", "Categories");
-            out.writeValue("isroot", true);
-            out.writeValue("selectable", false);
+            out.writeNullValue(ID_ID);
+            out.writeValue(ID_NAME, "Categories");
+            out.writeValue(ID_ISROOT, true);
+            out.writeValue(ID_SELECTABLE, false);
          }
          else
          {
-            out.writeValue("id", strParentRef);
-            out.writeValue("name", Repository.getNameForNode(this.internalNodeService, parentRef));
+            out.writeValue(ID_ID, strParentRef);
+            out.writeValue(ID_NAME, Repository.getNameForNode(this.internalNodeService, parentRef));
          }
          out.endObject();
          out.endValue();
-         out.startValue("children");
+         out.startValue(ID_CHILDREN);
          out.startArray();
          for (ChildAssociationRef ref : childRefs)
          {
             NodeRef nodeRef = ref.getChildRef();
             out.startObject();
-            out.writeValue("id", nodeRef.toString());
-            out.writeValue("name", Repository.getNameForNode(this.internalNodeService, nodeRef));
+            out.writeValue(ID_ID, nodeRef.toString());
+            out.writeValue(ID_NAME, Repository.getNameForNode(this.internalNodeService, nodeRef));
             out.endObject();
          }
          out.endArray();
@@ -188,7 +197,7 @@ public class PickerBean
          NodeRef companyHomeRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId(fc));
          NodeRef parentRef = null;
          Map params = fc.getExternalContext().getRequestParameterMap();
-         String strParentRef = (String)params.get("parent");
+         String strParentRef = (String)params.get(ID_PARENT);
          if (strParentRef == null || strParentRef.length() == 0)
          {
             parentRef = companyHomeRef;
@@ -202,27 +211,27 @@ public class PickerBean
          
          JSONWriter out = new JSONWriter(fc.getResponseWriter());
          out.startObject();
-         out.startValue("parent");
+         out.startValue(ID_PARENT);
          out.startObject();
-         out.writeValue("id", strParentRef);
-         out.writeValue("name", Repository.getNameForNode(this.internalNodeService, parentRef));
+         out.writeValue(ID_ID, strParentRef);
+         out.writeValue(ID_NAME, Repository.getNameForNode(this.internalNodeService, parentRef));
          if (parentRef.equals(companyHomeRef))
          {
-            out.writeValue("isroot", true);
+            out.writeValue(ID_ISROOT, true);
          }
          out.endObject();
          out.endValue();
-         out.startValue("children");
+         out.startValue(ID_CHILDREN);
          out.startArray();
          
          // filter out those children that are not spaces
          for (FileInfo folder : folders)
          {
             out.startObject();
-            out.writeValue("id", folder.getNodeRef().toString());
-            out.writeValue("name", (String)folder.getProperties().get(ContentModel.PROP_NAME));
+            out.writeValue(ID_ID, folder.getNodeRef().toString());
+            out.writeValue(ID_NAME, (String)folder.getProperties().get(ContentModel.PROP_NAME));
             String icon = (String)folder.getProperties().get(ApplicationModel.PROP_ICON);
-            out.writeValue("icon", FOLDER_IMAGE_PREFIX + (icon != null ? icon + "-16.gif" : BrowseBean.SPACE_SMALL_DEFAULT + ".gif"));
+            out.writeValue(ID_ICON, FOLDER_IMAGE_PREFIX + (icon != null ? icon + "-16.gif" : BrowseBean.SPACE_SMALL_DEFAULT + ".gif"));
             out.endObject();
          }
          
@@ -257,7 +266,7 @@ public class PickerBean
          NodeRef companyHomeRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId(fc));
          NodeRef parentRef = null;
          Map params = fc.getExternalContext().getRequestParameterMap();
-         String strParentRef = (String)params.get("parent");
+         String strParentRef = (String)params.get(ID_PARENT);
          if (strParentRef == null || strParentRef.length() == 0)
          {
             parentRef = companyHomeRef;
@@ -271,40 +280,40 @@ public class PickerBean
          
          JSONWriter out = new JSONWriter(fc.getResponseWriter());
          out.startObject();
-         out.startValue("parent");
+         out.startValue(ID_PARENT);
          out.startObject();
-         out.writeValue("id", strParentRef);
-         out.writeValue("name", Repository.getNameForNode(this.internalNodeService, parentRef));
+         out.writeValue(ID_ID, strParentRef);
+         out.writeValue(ID_NAME, Repository.getNameForNode(this.internalNodeService, parentRef));
          if (parentRef.equals(companyHomeRef))
          {
-            out.writeValue("isroot", true);
+            out.writeValue(ID_ISROOT, true);
          }
-         out.writeValue("selectable", false);
+         out.writeValue(ID_SELECTABLE, false);
          out.endObject();
          out.endValue();
-         out.startValue("children");
+         out.startValue(ID_CHILDREN);
          out.startArray();
          
          // filter out those children that are not spaces
          for (FileInfo item : items)
          {
             out.startObject();
-            out.writeValue("id", item.getNodeRef().toString());
+            out.writeValue(ID_ID, item.getNodeRef().toString());
             String name = (String)item.getProperties().get(ContentModel.PROP_NAME);
-            out.writeValue("name", name);
+            out.writeValue(ID_NAME, name);
             if (dd.isSubClass(this.internalNodeService.getType(item.getNodeRef()), ContentModel.TYPE_FOLDER))
             {
                // found a folder
                String icon = (String)item.getProperties().get(ApplicationModel.PROP_ICON);
-               out.writeValue("icon", FOLDER_IMAGE_PREFIX + (icon != null ? icon + "-16.gif" : BrowseBean.SPACE_SMALL_DEFAULT + ".gif"));
-               out.writeValue("selectable", false);
+               out.writeValue(ID_ICON, FOLDER_IMAGE_PREFIX + (icon != null ? icon + "-16.gif" : BrowseBean.SPACE_SMALL_DEFAULT + ".gif"));
+               out.writeValue(ID_SELECTABLE, false);
             }
             else
             {
                // must be a file
                String icon = Utils.getFileTypeImage(fc, name, FileTypeImageSize.Small);
-               out.writeValue("icon", icon);
-               out.writeValue("url", DownloadContentServlet.generateBrowserURL(item.getNodeRef(), name));
+               out.writeValue(ID_ICON, icon);
+               out.writeValue(ID_URL, DownloadContentServlet.generateBrowserURL(item.getNodeRef(), name));
             }
             out.endObject();
          }
diff --git a/source/web/jsp/users/edit-user-details.jsp b/source/web/jsp/users/edit-user-details.jsp
index 58f6dbf644..ae6e431e87 100644
--- a/source/web/jsp/users/edit-user-details.jsp
+++ b/source/web/jsp/users/edit-user-details.jsp
@@ -53,31 +53,29 @@ function updateButtonState()
 	}
 }
 </script>
+</f:verbatim>
 
-<table cellpadding="2" cellspacing="2" border="0" width="100%">
-<tr>
-<td colspan="2"></f:verbatim><h:outputText value="#{msg.person_properties}" /><f:verbatim></td>
-</tr>
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.first_name}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="first-name" value="#{DialogManager.bean.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.last_name}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="last-name" value="#{DialogManager.bean.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.email}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="email" value="#{DialogManager.bean.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-</table>
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.person_properties}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%">
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.first_name}:"/>
+   <h:inputText id="first-name" value="#{DialogManager.bean.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+   
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.last_name}:"/>
+   <h:inputText id="last-name" value="#{DialogManager.bean.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+   
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.email}"/>
+   <h:inputText id="email" value="#{DialogManager.bean.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+</h:panelGrid>
+
+<f:verbatim>
 <script>
-updateButtonState();
-</script></f:verbatim>
+   updateButtonState();
+</script>
+</f:verbatim>
\ No newline at end of file
diff --git a/source/web/jsp/users/edit-user-properties.jsp b/source/web/jsp/users/edit-user-properties.jsp
index 59f9c0b1d7..12df947247 100644
--- a/source/web/jsp/users/edit-user-properties.jsp
+++ b/source/web/jsp/users/edit-user-properties.jsp
@@ -29,60 +29,42 @@
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
 
-<f:verbatim>
-<table cellpadding="2" cellspacing="2" border="0" width="100%">
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.user_properties}"/><f:verbatim></td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.username}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="userName" disabled="true" value="#{WizardManager.bean.userName}" size="35" maxlength="1024" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.password}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputSecret id="password" disabled="true" value="#{WizardManager.bean.password}" size="35" maxlength="1024" redisplay="true" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.confirm}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputSecret id="confirm" disabled="true" value="#{WizardManager.bean.confirm}" size="35" maxlength="1024" redisplay="true" />
-<f:verbatim>
-</td>
-</tr>
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.user_properties}" escape="false" />
+</h:panelGrid>
 
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.homespace}"/><f:verbatim></td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.home_space_location}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><r:spaceSelector id="space-selector" label="#{msg.select_home_space_prompt}" value="#{WizardManager.bean.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/><f:verbatim>
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.home_space_name}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="homeSpaceName" value="#{WizardManager.bean.homeSpaceName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td colspan=2>
+<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%">
+   <h:outputText value="#{msg.username}:"/>
+   <h:inputText id="userName" disabled="true" value="#{WizardManager.bean.userName}" size="35" maxlength="1024" />
+   
+   <h:outputText value="#{msg.password}:"/>
+   <h:inputSecret id="password" disabled="true" value="#{WizardManager.bean.password}" size="35" maxlength="1024" redisplay="true" />
+</h:panelGrid>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.homespace}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%">
+   <h:outputText value="#{msg.home_space_location}:"/>
+   <r:ajaxFolderSelector id="spaceSelector" label="#{msg.select_home_space_prompt}" 
+                      value="#{WizardManager.bean.homeSpaceLocation}" 
+                      initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
+                      styleClass="selector" />
+
+   <h:outputText value="#{msg.home_space_name}:"/>
+   <h:inputText id="homeSpaceName" value="#{WizardManager.bean.homeSpaceName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+</h:panelGrid>
+
+<f:verbatim>
 <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-<td valign=top style="padding-top:2px" width=20></f:verbatim><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/><f:verbatim></td>
-<td class="mainSubText">
-</f:verbatim><h:outputText value="#{msg.user_change_homespace_info}" />
-<f:verbatim></td>
-</tr>
+   <tr>
+      <td valign=top style="padding-top:2px" width=20></f:verbatim><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/><f:verbatim></td>
+      <td class="mainSubText"></f:verbatim><h:outputText value="#{msg.user_change_homespace_info}" /><f:verbatim></td>
+   </tr>
 </table>
 <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
-</td>
-</tr>
-</table></f:verbatim>
\ No newline at end of file
+</f:verbatim>
\ No newline at end of file
diff --git a/source/web/jsp/users/new-user-properties.jsp b/source/web/jsp/users/new-user-properties.jsp
index f719af6e00..1ca0fa8092 100644
--- a/source/web/jsp/users/new-user-properties.jsp
+++ b/source/web/jsp/users/new-user-properties.jsp
@@ -72,49 +72,42 @@ function updateButtonState()
 	}
 }
 </script>
+</f:verbatim>
 
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.user_properties}" escape="false" />
+</h:panelGrid>
 
-<table cellpadding="2" cellspacing="2" border="0" width="100%">
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.user_properties}"/><f:verbatim></td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.username}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="userName" value="#{WizardManager.bean.userName}" size="35" maxlength="1024" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();"/><f:verbatim>&nbsp;*
-&nbsp;</f:verbatim><h:message id="errors1" for="userName" style="color:red" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.password}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputSecret id="password" value="#{WizardManager.bean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" /><f:verbatim>&nbsp;*
-&nbsp;</f:verbatim><h:message id="errors2" for="password" style="color:red" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.confirm}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputSecret id="confirm" value="#{WizardManager.bean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" /><f:verbatim>&nbsp;*
-&nbsp;</f:verbatim><h:message id="errors3" for="confirm" style="color:red" /><f:verbatim>
-</td>
-</tr>
+<h:panelGrid columns="4" cellpadding="2" cellspacing="2" width="100%">
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.username}:"/>
+   <h:inputText id="userName" value="#{WizardManager.bean.userName}" size="35" maxlength="1024" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();"/>
+   <h:message id="errors1" for="userName" style="color:red" />
+   
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.password}:"/>
+   <h:inputSecret id="password" value="#{WizardManager.bean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
+   <h:message id="errors2" for="password" style="color:red" />
+   
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.confirm}:"/>
+   <h:inputSecret id="confirm" value="#{WizardManager.bean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
+   <h:message id="errors3" for="confirm" style="color:red" />
+</h:panelGrid>
 
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.homespace}"/><f:verbatim></td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.home_space_location}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><r:spaceSelector id="space-selector" label="#{msg.select_home_space_prompt}" value="#{WizardManager.bean.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/><f:verbatim>
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.home_space_name}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="homeSpaceName" value="#{WizardManager.bean.homeSpaceName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>
-</td>
-</tr>
-</table></f:verbatim>
\ No newline at end of file
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.homespace}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%">
+   <h:outputText value="#{msg.home_space_location}:"/>
+   <r:ajaxFolderSelector id="spaceSelector" label="#{msg.select_home_space_prompt}" 
+                      value="#{WizardManager.bean.homeSpaceLocation}" 
+                      initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
+                      styleClass="selector" />
+
+   <h:outputText value="#{msg.home_space_name}:"/>
+   <h:inputText id="homeSpaceName" value="#{WizardManager.bean.homeSpaceName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+</h:panelGrid>
\ No newline at end of file
diff --git a/source/web/jsp/users/person-properties.jsp b/source/web/jsp/users/person-properties.jsp
index b5a3465bf1..ef86dd0b8f 100644
--- a/source/web/jsp/users/person-properties.jsp
+++ b/source/web/jsp/users/person-properties.jsp
@@ -38,8 +38,8 @@
 	function updateButtonState()
 	{
 		if (document.getElementById("wizard:wizard-body:firstName").value.length == 0 ||
-		document.getElementById("wizard:wizard-body:lastName").value.length == 0 ||
-		document.getElementById("wizard:wizard-body:email").value.length == 0)
+   		 document.getElementById("wizard:wizard-body:lastName").value.length == 0 ||
+   		 document.getElementById("wizard:wizard-body:email").value.length == 0)
 		{
 			document.getElementById("wizard:next-button").disabled = true;			
 		}
@@ -49,70 +49,53 @@
 		}
 	}
 </script>
+</f:verbatim>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.person_properties}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%">
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.first_name}:"/>
+   <h:inputText id="firstName" value="#{WizardManager.bean.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+   
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.last_name}:"/>
+   <h:inputText id="lastName" value="#{WizardManager.bean.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+   
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.email}"/>
+   <h:inputText id="email" value="#{WizardManager.bean.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+</h:panelGrid>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.other_options}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%">
+   <h:outputText value="#{msg.company_id}:"/>
+   <h:inputText value="#{WizardManager.bean.companyId}" size="35" maxlength="1024" />
+   
+   <h:outputText value="#{msg.presence_provider}:"/>
+   <h:selectOneMenu value="#{WizardManager.bean.presenceProvider}">
+		<f:selectItem itemValue="" itemLabel="(#{msg.none})"/>
+		<f:selectItem itemValue="skype" itemLabel="Skype"/>
+		<f:selectItem itemValue="yahoo" itemLabel="Yahoo"/>
+	</h:selectOneMenu>
 	
-<table cellpadding="2" cellspacing="2" border="0" width="100%">
-<tr>
-	<td colspan="2" class="paddingRow"></td></tr>
-<tr>
-	<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.person_properties}"/><f:verbatim></td>
-</tr>
+	<h:outputText value="#{msg.presence_username}:"/>
+	<h:inputText value="#{WizardManager.bean.presenceUsername}" size="35" maxlength="256" />
 	
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.first_name}"/><f:verbatim>:</td>
-<td></f:verbatim>
-<h:inputText id="firstName" value="#{WizardManager.bean.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.last_name}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="lastName" value="#{WizardManager.bean.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.email}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText id="email" value="#{WizardManager.bean.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.other_options}"/><f:verbatim></td>
-</tr>
-<tr>
-<td></f:verbatim><h:outputText value="#{msg.company_id}"/><f:verbatim>:</td>
-<td>
-</f:verbatim><h:inputText value="#{WizardManager.bean.companyId}" size="35" maxlength="1024" /><f:verbatim>
-</td>
-</tr>
-
-<tr>
-	<td></f:verbatim><h:outputText value="Presence Provider"/><f:verbatim>:</td>
-	<td>
-		</f:verbatim><h:selectOneMenu value="#{WizardManager.bean.presenceProvider}">
-			<f:selectItem itemValue="" itemLabel="(None)"/>
-			<f:selectItem itemValue="skype" itemLabel="Skype"/>
-			<f:selectItem itemValue="yahoo" itemLabel="Yahoo"/>
-		</h:selectOneMenu><f:verbatim>
-	</td>
-</tr>
-<tr>
-	<td></f:verbatim><h:outputText value="Presence Username"/><f:verbatim>:</td>
-	<td>
-		</f:verbatim><h:inputText value="#{WizardManager.bean.presenceUsername}" size="35" maxlength="256" /><f:verbatim>
-	</td>
-</tr>
-<tr>
-	<td></f:verbatim><h:outputText value="#{msg.sizeQuota}:" rendered="#{UsersBeanProperties.usagesEnabled == true}"/><f:verbatim></td>
-	<td>
-		</f:verbatim><h:inputText value="#{WizardManager.bean.sizeQuota}" size="10" maxlength="256" rendered="#{UsersBeanProperties.usagesEnabled == true}"/><f:verbatim>
-		</f:verbatim><h:selectOneMenu value="#{WizardManager.bean.sizeQuotaUnits}" rendered="#{UsersBeanProperties.usagesEnabled == true}">
-		    <f:selectItem itemValue="gigabyte" itemLabel="#{msg.gigabyte}"/>
-			<f:selectItem itemValue="megabyte" itemLabel="#{msg.megabyte}"/>
-			<f:selectItem itemValue="kilobyte" itemLabel="#{msg.kilobyte}"/>
-		</h:selectOneMenu><f:verbatim>
-	</td>
-</tr>
-
-</table></f:verbatim>
\ No newline at end of file
+	<h:outputText value="#{msg.sizeQuota}:" rendered="#{UsersBeanProperties.usagesEnabled == true}"/>
+	<h:panelGroup>
+   	<h:inputText value="#{WizardManager.bean.sizeQuota}" size="10" maxlength="256" rendered="#{UsersBeanProperties.usagesEnabled == true}"/>
+   	<h:selectOneMenu value="#{WizardManager.bean.sizeQuotaUnits}" rendered="#{UsersBeanProperties.usagesEnabled == true}">
+   	    <f:selectItem itemValue="gigabyte" itemLabel="#{msg.gigabyte}"/>
+   		<f:selectItem itemValue="megabyte" itemLabel="#{msg.megabyte}"/>
+   		<f:selectItem itemValue="kilobyte" itemLabel="#{msg.kilobyte}"/>
+   	</h:selectOneMenu>
+	</h:panelGroup>
+</h:panelGrid>
\ No newline at end of file