Index: trunk/themes/default/login/login_form.tpl
===================================================================
diff -u -N -r1120 -r1829
--- trunk/themes/default/login/login_form.tpl	(.../login_form.tpl)	(revision 1120)
+++ trunk/themes/default/login/login_form.tpl	(.../login_form.tpl)	(revision 1829)
@@ -12,7 +12,14 @@
 	  			<td colspan="3" class="error"><inp:m_list_form_errors _Form="login" _ItemTemplate="misc/form_error.tpl" /></td>
 	  		</tr>
 	  		<tr>
-	  			<td class="field-name"><inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> <span class="error">*</span></td>
+	  			<td class="field-name">
+	  				<inp2:m_if check="u_UseUsernames">
+						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+					<inp2:m_else/>
+						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+					</inp2:m_if>
+	  				<span class="error">*</span>
+	  			</td>
 	  			<td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
 	  			<td>&nbsp;</td>
 	  		</tr>
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.0.sql
===================================================================
diff -u -N -r1812 -r1829
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.0.sql	(.../inportal_upgrade_v1.1.0.sql)	(revision 1812)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.0.sql	(.../inportal_upgrade_v1.1.0.sql)	(revision 1829)
@@ -14,7 +14,7 @@
 CREATE TABLE Stylesheets ( StylesheetId int(11) NOT NULL auto_increment, Name varchar(255) NOT NULL default '', Description varchar(255) NOT NULL default '', AdvancedCSS text NOT NULL, LastCompiled int(10) unsigned NOT NULL default '0', Enabled int(11) NOT NULL default '0', PRIMARY KEY  (StylesheetId) );
 
 INSERT INTO ConfigurationAdmin VALUES ('Email_As_Login', 'la_Text_General', 'la_use_emails_as_login', 'checkbox', NULL, NULL, 1, 0);
-INSERT INTO ConfigurationValues VALUES ('Email_As_Login', '1', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationValues VALUES ('Email_As_Login', '0', 'In-Portal:Users', 'in-portal:configure_users');
 
 ALTER TABLE Language ADD COLUMN UnitSystem TINYINT DEFAULT '1' NOT NULL;
 UPDATE Language SET UnitSystem = 2 WHERE PackName = 'English';
Index: trunk/themes/default/misc/right_login.tpl
===================================================================
diff -u -N -r640 -r1829
--- trunk/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 640)
+++ trunk/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 1829)
@@ -28,7 +28,13 @@
 					<td valign="top">
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr>
-								<td class="field-title"><inp:m_language _Phrase="lu_prompt_username" />:</td>
+								<td class="field-title">
+									<inp2:m_if check="u_UseUsernames">
+										<inp:m_language _Phrase="lu_prompt_username" />:
+									<inp2:m_else/>
+										<inp:m_language _Phrase="lu_prompt_email" />:
+									</inp2:m_if>
+								</td>
 							</tr>
 							<tr>
 								<td><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
Index: trunk/themes/default/rate_access_denied.tpl
===================================================================
diff -u -N -r13 -r1829
--- trunk/themes/default/rate_access_denied.tpl	(.../rate_access_denied.tpl)	(revision 13)
+++ trunk/themes/default/rate_access_denied.tpl	(.../rate_access_denied.tpl)	(revision 1829)
@@ -14,7 +14,14 @@
                     <td colspan="3" class="error"><inp:m_list_form_errors _Form="login" _ItemTemplate="misc/form_error.tpl" /></td>
                 </tr>
                 <tr>
-                    <td class="field-name"><inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> <span class="error">*</span></td>
+                    <td class="field-name">
+						<inp2:m_if check="u_UseUsernames">
+							<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+						<inp2:m_else/>
+							<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+						</inp2:m_if>
+                    	<span class="error">*</span>
+                    </td>
                     <td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
                     <td>&nbsp;</td>
                 </tr>
Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -N -r1823 -r1829
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 1823)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 1829)
@@ -981,10 +981,10 @@
 		}
 	}
 	
-	function Format($value, $field_name, &$object, $format=null)
+	/*function Format($value, $field_name, &$object, $format=null)
 	{
 		return parent::Format($value, $field_name, $object, $format);
-	}
+	}*/
 	
 /*	function Format($value, $field_name, &$object, $format=null)
 	{
Index: trunk/themes/default/review_access_denied.tpl
===================================================================
diff -u -N -r13 -r1829
--- trunk/themes/default/review_access_denied.tpl	(.../review_access_denied.tpl)	(revision 13)
+++ trunk/themes/default/review_access_denied.tpl	(.../review_access_denied.tpl)	(revision 1829)
@@ -14,7 +14,14 @@
                     <td colspan="3" class="error"><inp:m_list_form_errors _Form="login" _ItemTemplate="misc/form_error.tpl" /></td>
                 </tr>
                 <tr>
-                    <td class="field-name"><inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> <span class="error">*</span></td>
+                    <td class="field-name">
+                    	<inp2:m_if check="u_UseUsernames">
+							<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+						<inp2:m_else/>
+							<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+						</inp2:m_if>
+                    	<span class="error">*</span>
+                    </td>
                     <td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
                     <td>&nbsp;</td>
                 </tr>