Index: branches/unlabeled/unlabeled-1.3.2/core/install/install_data.sql
===================================================================
diff -u -r6787 -r6915
--- branches/unlabeled/unlabeled-1.3.2/core/install/install_data.sql	(.../install_data.sql)	(revision 6787)
+++ branches/unlabeled/unlabeled-1.3.2/core/install/install_data.sql	(.../install_data.sql)	(revision 6915)
@@ -549,3 +549,7 @@
 INSERT INTO StdDestinations VALUES (306, 2, 225, 'la_state_AL', 'AL', NULL);
 
 INSERT INTO PermCache (CategoryId, PermId, ACL) VALUES (0, 1, '11,12,13,14,15');
+
+INSERT INTO Permissions VALUES (0, 'LOGIN', 13, 1, 1, 0);
+INSERT INTO Permissions VALUES (0, 'LOGIN', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (0, 'ADMIN', 11, 1, 1, 0);
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.3.2/core/install/install_schema.sql
===================================================================
diff -u -r6912 -r6915
--- branches/unlabeled/unlabeled-1.3.2/core/install/install_schema.sql	(.../install_schema.sql)	(revision 6912)
+++ branches/unlabeled/unlabeled-1.3.2/core/install/install_schema.sql	(.../install_schema.sql)	(revision 6915)
@@ -3,6 +3,17 @@
 # ALTER TABLE ThemeFiles ADD FileFound TINYINT UNSIGNED NOT NULL DEFAULT '0';
 # ALTER TABLE ThemeFiles ADD INDEX (FileFound);
 
+CREATE TABLE Permissions (
+  PermissionId int(11) NOT NULL auto_increment,
+  Permission varchar(255) NOT NULL default '',
+  GroupId int(11) default '0',
+  PermissionValue int(11) NOT NULL default '0',
+  `Type` tinyint(4) NOT NULL default '0',
+  CatId int(11) NOT NULL default '0',
+  PRIMARY KEY  (PermissionId),
+  UNIQUE KEY PermIndex (Permission,GroupId,CatId,`Type`)
+); 
+
 CREATE TABLE CustomField (
   CustomFieldId int(11) NOT NULL auto_increment,
   Type int(11) NOT NULL default '0',
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r6894 -r6915
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 6894)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 6915)
@@ -100,6 +100,20 @@
 	</tr>
 <inp2:m_blockend/>
 
+<inp2:m_DefineElement name="inp_edit_password" class="" size="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td>
+			<input type="password" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
+	</tr>
+</inp2:m_DefineElement>
+
 <inp2:m_block name="inp_edit_upload" class="" is_last=""/>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r6913 -r6915
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 6913)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 6915)
@@ -61,8 +61,8 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="PasswordVerify" title="la_fld_PasswordVerify"/>
+		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>