diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
index faec8edbd5dac..6a5f9646ed150 100644
--- a/components/com_users/views/login/tmpl/default_login.php
+++ b/components/com_users/views/login/tmpl/default_login.php
@@ -11,34 +11,29 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
 ?>
 <div class="login<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
-	<div class="page-header">
-		<h1>
-			<?php echo $this->escape($this->params->get('page_heading')); ?>
-		</h1>
-	</div>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
 	<?php endif; ?>
-
 	<?php if (($this->params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>
-	<div class="login-description">
+		<div class="login-description">
+	<?php endif; ?>
+	<?php if ($this->params->get('logindescription_show') == 1) : ?>
+		<?php echo $this->params->get('login_description'); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('login_image') != '') : ?>
+		<img src="<?php echo $this->escape($this->params->get('login_image')); ?>" class="login-image" alt="<?php echo JText::_('COM_USERS_LOGIN_IMAGE_ALT'); ?>" />
 	<?php endif; ?>
-
-		<?php if ($this->params->get('logindescription_show') == 1) : ?>
-			<?php echo $this->params->get('login_description'); ?>
-		<?php endif; ?>
-
-		<?php if ($this->params->get('login_image') != '') : ?>
-			<img src="<?php echo $this->escape($this->params->get('login_image')); ?>" class="login-image" alt="<?php echo JText::_('COM_USERS_LOGIN_IMAGE_ALT'); ?>"/>
-		<?php endif; ?>
-
 	<?php if (($this->params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>
-	</div>
+		</div>
 	<?php endif; ?>
-
 	<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="form-validate form-horizontal well">
-
 		<fieldset>
 			<?php foreach ($this->form->getFieldset('credentials') as $field) : ?>
 				<?php if (!$field->hidden) : ?>
@@ -52,7 +47,6 @@
 					</div>
 				<?php endif; ?>
 			<?php endforeach; ?>
-
 			<?php if ($this->tfa) : ?>
 				<div class="control-group">
 					<div class="control-label">
@@ -63,14 +57,18 @@
 					</div>
 				</div>
 			<?php endif; ?>
-
 			<?php if (JPluginHelper::isEnabled('system', 'remember')) : ?>
-			<div  class="control-group">
-				<div class="control-label"><label><?php echo JText::_('COM_USERS_LOGIN_REMEMBER_ME') ?></label></div>
-				<div class="controls"><input id="remember" type="checkbox" name="remember" class="inputbox" value="yes"/></div>
-			</div>
+				<div class="control-group">
+					<div class="control-label">
+						<label>
+							<?php echo JText::_('COM_USERS_LOGIN_REMEMBER_ME'); ?>
+						</label>
+					</div>
+					<div class="controls">
+						<input id="remember" type="checkbox" name="remember" class="inputbox" value="yes" />
+					</div>
+				</div>
 			<?php endif; ?>
-
 			<div class="control-group">
 				<div class="controls">
 					<button type="submit" class="btn btn-primary">
@@ -78,7 +76,6 @@
 					</button>
 				</div>
 			</div>
-
 			<?php $return = $this->form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?>
 			<input type="hidden" name="return" value="<?php echo base64_encode($return); ?>" />
 			<?php echo JHtml::_('form.token'); ?>
@@ -89,19 +86,21 @@
 	<ul class="nav nav-tabs nav-stacked">
 		<li>
 			<a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
-			<?php echo JText::_('COM_USERS_LOGIN_RESET'); ?></a>
+				<?php echo JText::_('COM_USERS_LOGIN_RESET'); ?>
+			</a>
 		</li>
 		<li>
 			<a href="<?php echo JRoute::_('index.php?option=com_users&view=remind'); ?>">
-			<?php echo JText::_('COM_USERS_LOGIN_REMIND'); ?></a>
-		</li>
-		<?php
-		$usersConfig = JComponentHelper::getParams('com_users');
-		if ($usersConfig->get('allowUserRegistration')) : ?>
-		<li>
-			<a href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
-				<?php echo JText::_('COM_USERS_LOGIN_REGISTER'); ?></a>
+				<?php echo JText::_('COM_USERS_LOGIN_REMIND'); ?>
+			</a>
 		</li>
+		<?php $usersConfig = JComponentHelper::getParams('com_users'); ?>
+		<?php if ($usersConfig->get('allowUserRegistration')) : ?>
+			<li>
+				<a href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
+					<?php echo JText::_('COM_USERS_LOGIN_REGISTER'); ?>
+				</a>
+			</li>
 		<?php endif; ?>
 	</ul>
 </div>
diff --git a/components/com_users/views/login/tmpl/default_logout.php b/components/com_users/views/login/tmpl/default_logout.php
index f4796aec4c139..961b56a816766 100644
--- a/components/com_users/views/login/tmpl/default_logout.php
+++ b/components/com_users/views/login/tmpl/default_logout.php
@@ -8,36 +8,35 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <div class="logout<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
-	<div class="page-header">
-		<h1>
-			<?php echo $this->escape($this->params->get('page_heading')); ?>
-		</h1>
-	</div>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
 	<?php endif; ?>
-
 	<?php if (($this->params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?>
-	<div class="logout-description">
+		<div class="logout-description">
+	<?php endif; ?>
+	<?php if ($this->params->get('logoutdescription_show') == 1) : ?>
+		<?php echo $this->params->get('logout_description'); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('logout_image') != '') : ?>
+		<img src="<?php echo $this->escape($this->params->get('logout_image')); ?>" class="thumbnail pull-right logout-image" alt="<?php echo JText::_('COM_USER_LOGOUT_IMAGE_ALT'); ?>" />
 	<?php endif; ?>
-
-		<?php if ($this->params->get('logoutdescription_show') == 1) : ?>
-			<?php echo $this->params->get('logout_description'); ?>
-		<?php endif; ?>
-
-		<?php if ($this->params->get('logout_image') != '') : ?>
-			<img src="<?php echo $this->escape($this->params->get('logout_image')); ?>" class="thumbnail pull-right logout-image" alt="<?php echo JText::_('COM_USER_LOGOUT_IMAGE_ALT'); ?>"/>
-		<?php endif; ?>
-
 	<?php if (($this->params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?>
-	</div>
+		</div>
 	<?php endif; ?>
-
 	<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.logout'); ?>" method="post" class="form-horizontal well">
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary"><span class="icon-arrow-left icon-white"></span> <?php echo JText::_('JLOGOUT'); ?></button>
+				<button type="submit" class="btn btn-primary">
+					<span class="icon-arrow-left icon-white"></span>
+					<?php echo JText::_('JLOGOUT'); ?>
+				</button>
 			</div>
 		</div>
 		<?php if ($this->params->get('logout_redirect_url')) : ?>
diff --git a/components/com_users/views/profile/tmpl/default.php b/components/com_users/views/profile/tmpl/default.php
index e3f8726409d5c..1da245593fbc4 100644
--- a/components/com_users/views/profile/tmpl/default.php
+++ b/components/com_users/views/profile/tmpl/default.php
@@ -8,27 +8,27 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <div class="profile<?php echo $this->pageclass_sfx; ?>">
-<?php if ($this->params->get('show_page_heading')) : ?>
-<div class="page-header">
-	<h1>
-		<?php echo $this->escape($this->params->get('page_heading')); ?>
-	</h1>
-</div>
-<?php endif; ?>
-<?php if (JFactory::getUser()->id == $this->data->id) : ?>
-<ul class="btn-toolbar pull-right">
-	<li class="btn-group">
-		<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&task=profile.edit&user_id=' . (int) $this->data->id); ?>">
-			<span class="icon-user"></span> <?php echo JText::_('COM_USERS_EDIT_PROFILE'); ?></a>
-	</li>
-</ul>
-<?php endif; ?>
-<?php echo $this->loadTemplate('core'); ?>
-
-<?php echo $this->loadTemplate('params'); ?>
-
-<?php echo $this->loadTemplate('custom'); ?>
-
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<?php if (JFactory::getUser()->id == $this->data->id) : ?>
+		<ul class="btn-toolbar pull-right">
+			<li class="btn-group">
+				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&task=profile.edit&user_id=' . (int) $this->data->id); ?>">
+					<span class="icon-user"></span>
+					<?php echo JText::_('COM_USERS_EDIT_PROFILE'); ?>
+				</a>
+			</li>
+		</ul>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('core'); ?>
+	<?php echo $this->loadTemplate('params'); ?>
+	<?php echo $this->loadTemplate('custom'); ?>
 </div>
diff --git a/components/com_users/views/profile/tmpl/default_core.php b/components/com_users/views/profile/tmpl/default_core.php
index 70db95e5e0967..0a1178322981e 100644
--- a/components/com_users/views/profile/tmpl/default_core.php
+++ b/components/com_users/views/profile/tmpl/default_core.php
@@ -10,7 +10,6 @@
 defined('_JEXEC') or die;
 
 ?>
-
 <fieldset id="users-profile-core">
 	<legend>
 		<?php echo JText::_('COM_USERS_PROFILE_CORE_LEGEND'); ?>
@@ -37,7 +36,6 @@
 		<dt>
 			<?php echo JText::_('COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL'); ?>
 		</dt>
-
 		<?php if ($this->data->lastvisitDate != $this->db->getNullDate()) : ?>
 			<dd>
 				<?php echo JHtml::_('date', $this->data->lastvisitDate); ?>
@@ -47,6 +45,5 @@
 				<?php echo JText::_('COM_USERS_PROFILE_NEVER_VISITED'); ?>
 			</dd>
 		<?php endif; ?>
-
 	</dl>
 </fieldset>
diff --git a/components/com_users/views/profile/tmpl/default_custom.php b/components/com_users/views/profile/tmpl/default_custom.php
index 9a8d40c6a9c70..169277793c4d2 100644
--- a/components/com_users/views/profile/tmpl/default_custom.php
+++ b/components/com_users/views/profile/tmpl/default_custom.php
@@ -31,6 +31,7 @@
 {
 	$customFields[$customField->name] = $customField;
 }
+
 ?>
 <?php foreach ($fieldsets as $group => $fieldset) : ?>
 	<?php $fields = $this->form->getFieldset($group); ?>
@@ -45,7 +46,9 @@
 			<dl class="dl-horizontal">
 				<?php foreach ($fields as $field) : ?>
 					<?php if (!$field->hidden && $field->type !== 'Spacer') : ?>
-						<dt><?php echo $field->title; ?></dt>
+						<dt>
+							<?php echo $field->title; ?>
+						</dt>
 						<dd>
 							<?php if (key_exists($field->fieldname, $customFields)) : ?>
 								<?php echo $customFields[$field->fieldname]->value ?: JText::_('COM_USERS_PROFILE_VALUE_NOT_FOUND'); ?>
diff --git a/components/com_users/views/profile/tmpl/default_params.php b/components/com_users/views/profile/tmpl/default_params.php
index 8237f061d1fdf..c58b018a67882 100644
--- a/components/com_users/views/profile/tmpl/default_params.php
+++ b/components/com_users/views/profile/tmpl/default_params.php
@@ -14,25 +14,27 @@
 ?>
 <?php $fields = $this->form->getFieldset('params'); ?>
 <?php if (count($fields)) : ?>
-<fieldset id="users-profile-custom">
-	<legend><?php echo JText::_('COM_USERS_SETTINGS_FIELDSET_LABEL'); ?></legend>
-	<dl class="dl-horizontal">
-	<?php foreach ($fields as $field) :
-		if (!$field->hidden) : ?>
-		<dt><?php echo $field->title; ?></dt>
-		<dd>
-			<?php if (JHtml::isRegistered('users.' . $field->id)) : ?>
-				<?php echo JHtml::_('users.' . $field->id, $field->value); ?>
-			<?php elseif (JHtml::isRegistered('users.' . $field->fieldname)) : ?>
-				<?php echo JHtml::_('users.' . $field->fieldname, $field->value); ?>
-			<?php elseif (JHtml::isRegistered('users.' . $field->type)) : ?>
-				<?php echo JHtml::_('users.' . $field->type, $field->value); ?>
-			<?php else : ?>
-				<?php echo JHtml::_('users.value', $field->value); ?>
-			<?php endif; ?>
-		</dd>
-		<?php endif; ?>
-	<?php endforeach; ?>
-	</dl>
-</fieldset>
+	<fieldset id="users-profile-custom">
+		<legend><?php echo JText::_('COM_USERS_SETTINGS_FIELDSET_LABEL'); ?></legend>
+		<dl class="dl-horizontal">
+			<?php foreach ($fields as $field) : ?>
+				<?php if (!$field->hidden) : ?>
+					<dt>
+						<?php echo $field->title; ?>
+					</dt>
+					<dd>
+						<?php if (JHtml::isRegistered('users.' . $field->id)) : ?>
+							<?php echo JHtml::_('users.' . $field->id, $field->value); ?>
+						<?php elseif (JHtml::isRegistered('users.' . $field->fieldname)) : ?>
+							<?php echo JHtml::_('users.' . $field->fieldname, $field->value); ?>
+						<?php elseif (JHtml::isRegistered('users.' . $field->type)) : ?>
+							<?php echo JHtml::_('users.' . $field->type, $field->value); ?>
+						<?php else : ?>
+							<?php echo JHtml::_('users.value', $field->value); ?>
+						<?php endif; ?>
+					</dd>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		</dl>
+	</fieldset>
 <?php endif; ?>
diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index f337baf93e7b9..09c5705904831 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -21,16 +21,18 @@
 <div class="profile-edit<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<div class="page-header">
-			<h1><?php echo $this->escape($this->params->get('page_heading')); ?></h1>
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
 		</div>
 	<?php endif; ?>
-
 	<script type="text/javascript">
 		Joomla.twoFactorMethodChange = function(e)
 		{
 			var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val();
 
-			jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) {
+			jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el)
+			{
 				if (el.id != selectedPane)
 				{
 					jQuery('#' + el.id).hide(0);
@@ -42,99 +44,103 @@
 			});
 		}
 	</script>
-
 	<form id="member-profile" action="<?php echo JRoute::_('index.php?option=com_users&task=profile.save'); ?>" method="post" class="form-validate form-horizontal well" enctype="multipart/form-data">
-	<?php // Iterate through the form fieldsets and display each one. ?>
-	<?php foreach ($this->form->getFieldsets() as $group => $fieldset) : ?>
-		<?php $fields = $this->form->getFieldset($group); ?>
-		<?php if (count($fields)) : ?>
-		<fieldset>
-			<?php // If the fieldset has a label set, display it as the legend. ?>
-			<?php if (isset($fieldset->label)) : ?>
-			<legend>
-				<?php echo JText::_($fieldset->label); ?>
-			</legend>
-			<?php endif; ?>
-			<?php if (isset($fieldset->description) && trim($fieldset->description)) : ?>
-				<?php echo '<p>' . $this->escape(JText::_($fieldset->description)) . '</p>'; ?>
-			<?php endif; ?>
-			<?php // Iterate through the fields in the set and display them. ?>
-			<?php foreach ($fields as $field) : ?>
-			<?php // If the field is hidden, just display the input. ?>
-				<?php if ($field->hidden) : ?>
-					<?php echo $field->input; ?>
-				<?php else : ?>
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $field->label; ?>
-							<?php if (!$field->required && $field->type !== 'Spacer') : ?>
-								<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL'); ?></span>
-							<?php endif; ?>
-						</div>
-						<div class="controls">
-							<?php if ($field->fieldname === 'password1') : ?>
-								<?php // Disables autocomplete ?> <input type="password" style="display:none">
-							<?php endif; ?>
+		<?php // Iterate through the form fieldsets and display each one. ?>
+		<?php foreach ($this->form->getFieldsets() as $group => $fieldset) : ?>
+			<?php $fields = $this->form->getFieldset($group); ?>
+			<?php if (count($fields)) : ?>
+				<fieldset>
+					<?php // If the fieldset has a label set, display it as the legend. ?>
+					<?php if (isset($fieldset->label)) : ?>
+						<legend>
+							<?php echo JText::_($fieldset->label); ?>
+						</legend>
+					<?php endif; ?>
+					<?php if (isset($fieldset->description) && trim($fieldset->description)) : ?>
+						<p>
+							<?php echo $this->escape(JText::_($fieldset->description)); ?>
+						</p>
+					<?php endif; ?>
+					<?php // Iterate through the fields in the set and display them. ?>
+					<?php foreach ($fields as $field) : ?>
+						<?php // If the field is hidden, just display the input. ?>
+						<?php if ($field->hidden) : ?>
 							<?php echo $field->input; ?>
-						</div>
+						<?php else : ?>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $field->label; ?>
+									<?php if (!$field->required && $field->type !== 'Spacer') : ?>
+										<span class="optional">
+											<?php echo JText::_('COM_USERS_OPTIONAL'); ?>
+										</span>
+									<?php endif; ?>
+								</div>
+								<div class="controls">
+									<?php if ($field->fieldname === 'password1') : ?>
+										<?php // Disables autocomplete ?>
+										<input type="password" style="display:none">
+									<?php endif; ?>
+									<?php echo $field->input; ?>
+								</div>
+							</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</fieldset>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<?php if (count($this->twofactormethods) > 1) : ?>
+			<fieldset>
+				<legend><?php echo JText::_('COM_USERS_PROFILE_TWO_FACTOR_AUTH'); ?></legend>
+				<div class="control-group">
+					<div class="control-label">
+						<label id="jform_twofactor_method-lbl" for="jform_twofactor_method" class="hasTooltip"
+							title="<?php echo '<strong>' . JText::_('COM_USERS_PROFILE_TWOFACTOR_LABEL') . '</strong><br />' . JText::_('COM_USERS_PROFILE_TWOFACTOR_DESC'); ?>">
+							<?php echo JText::_('COM_USERS_PROFILE_TWOFACTOR_LABEL'); ?>
+						</label>
+					</div>
+					<div class="controls">
+						<?php echo JHtml::_('select.genericlist', $this->twofactormethods, 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange()'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
 					</div>
-				<?php endif; ?>
-			<?php endforeach; ?>
-		</fieldset>
-		<?php endif; ?>
-	<?php endforeach; ?>
-
-	<?php if (count($this->twofactormethods) > 1) : ?>
-		<fieldset>
-			<legend><?php echo JText::_('COM_USERS_PROFILE_TWO_FACTOR_AUTH'); ?></legend>
-
-			<div class="control-group">
-				<div class="control-label">
-					<label id="jform_twofactor_method-lbl" for="jform_twofactor_method" class="hasTooltip"
-						   title="<?php echo '<strong>' . JText::_('COM_USERS_PROFILE_TWOFACTOR_LABEL') . '</strong><br />' . JText::_('COM_USERS_PROFILE_TWOFACTOR_DESC'); ?>">
-						<?php echo JText::_('COM_USERS_PROFILE_TWOFACTOR_LABEL'); ?>
-					</label>
 				</div>
-				<div class="controls">
-					<?php echo JHtml::_('select.genericlist', $this->twofactormethods, 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange()'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
+				<div id="com_users_twofactor_forms_container">
+					<?php foreach ($this->twofactorform as $form) : ?>
+						<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
+						<div id="com_users_twofactor_<?php echo $form['method']; ?>" style="<?php echo $style; ?>">
+							<?php echo $form['form']; ?>
+						</div>
+					<?php endforeach; ?>
 				</div>
-			</div>
-			<div id="com_users_twofactor_forms_container">
-				<?php foreach ($this->twofactorform as $form) : ?>
-				<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
-				<div id="com_users_twofactor_<?php echo $form['method']; ?>" style="<?php echo $style; ?>">
-					<?php echo $form['form']; ?>
+			</fieldset>
+			<fieldset>
+				<legend>
+					<?php echo JText::_('COM_USERS_PROFILE_OTEPS'); ?>
+				</legend>
+				<div class="alert alert-info">
+					<?php echo JText::_('COM_USERS_PROFILE_OTEPS_DESC'); ?>
 				</div>
-				<?php endforeach; ?>
-			</div>
-		</fieldset>
-
-		<fieldset>
-			<legend>
-				<?php echo JText::_('COM_USERS_PROFILE_OTEPS'); ?>
-			</legend>
-			<div class="alert alert-info">
-				<?php echo JText::_('COM_USERS_PROFILE_OTEPS_DESC'); ?>
-			</div>
-			<?php if (empty($this->otpConfig->otep)) : ?>
-			<div class="alert alert-warning">
-				<?php echo JText::_('COM_USERS_PROFILE_OTEPS_WAIT_DESC'); ?>
-			</div>
-			<?php else : ?>
-			<?php foreach ($this->otpConfig->otep as $otep) : ?>
-			<span class="span3">
-				<?php echo substr($otep, 0, 4); ?>-<?php echo substr($otep, 4, 4); ?>-<?php echo substr($otep, 8, 4); ?>-<?php echo substr($otep, 12, 4); ?>
-			</span>
-			<?php endforeach; ?>
-			<div class="clearfix"></div>
-			<?php endif; ?>
-		</fieldset>
-	<?php endif; ?>
-
+				<?php if (empty($this->otpConfig->otep)) : ?>
+					<div class="alert alert-warning">
+						<?php echo JText::_('COM_USERS_PROFILE_OTEPS_WAIT_DESC'); ?>
+					</div>
+				<?php else : ?>
+					<?php foreach ($this->otpConfig->otep as $otep) : ?>
+						<span class="span3">
+							<?php echo substr($otep, 0, 4); ?>-<?php echo substr($otep, 4, 4); ?>-<?php echo substr($otep, 8, 4); ?>-<?php echo substr($otep, 12, 4); ?>
+						</span>
+					<?php endforeach; ?>
+					<div class="clearfix"></div>
+				<?php endif; ?>
+			</fieldset>
+		<?php endif; ?>
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate"><span><?php echo JText::_('JSUBMIT'); ?></span></button>
-				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&view=profile'); ?>" title="<?php echo JText::_('JCANCEL'); ?>"><?php echo JText::_('JCANCEL'); ?></a>
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&view=profile'); ?>" title="<?php echo JText::_('JCANCEL'); ?>">
+					<?php echo JText::_('JCANCEL'); ?>
+				</a>
 				<input type="hidden" name="option" value="com_users" />
 				<input type="hidden" name="task" value="profile.save" />
 			</div>
diff --git a/components/com_users/views/registration/tmpl/complete.php b/components/com_users/views/registration/tmpl/complete.php
index 80f004d3ff4e5..7537f245505ac 100644
--- a/components/com_users/views/registration/tmpl/complete.php
+++ b/components/com_users/views/registration/tmpl/complete.php
@@ -8,11 +8,12 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <div class="registration-complete<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
-	<h1>
-		<?php echo $this->escape($this->params->get('page_heading')); ?>
-	</h1>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
 	<?php endif; ?>
 </div>
diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php
index 37db119fff296..97558f43ce30f 100644
--- a/components/com_users/views/registration/tmpl/default.php
+++ b/components/com_users/views/registration/tmpl/default.php
@@ -11,6 +11,7 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
 ?>
 <div class="registration<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
@@ -18,43 +19,46 @@
 			<h1><?php echo $this->escape($this->params->get('page_heading')); ?></h1>
 		</div>
 	<?php endif; ?>
-
 	<form id="member-registration" action="<?php echo JRoute::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="form-validate form-horizontal well" enctype="multipart/form-data">
 		<?php // Iterate through the form fieldsets and display each one. ?>
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
 			<?php if (count($fields)) : ?>
 				<fieldset>
-				<?php // If the fieldset has a label set, display it as the legend. ?>
-				<?php if (isset($fieldset->label)) : ?>
-					<legend><?php echo JText::_($fieldset->label); ?></legend>
-				<?php endif; ?>
-				<?php // Iterate through the fields in the set and display them. ?>
-				<?php foreach ($fields as $field) : ?>
-					<?php // If the field is hidden, just display the input. ?>
-					<?php if ($field->hidden) : ?>
-						<?php echo $field->input; ?>
-					<?php else : ?>
-						<div class="control-group">
-							<div class="control-label">
-							<?php echo $field->label; ?>
-							<?php if (!$field->required && $field->type !== 'Spacer') : ?>
-								<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL'); ?></span>
-							<?php endif; ?>
-							</div>
-							<div class="controls">
-								<?php echo $field->input; ?>
-							</div>
-						</div>
+					<?php // If the fieldset has a label set, display it as the legend. ?>
+					<?php if (isset($fieldset->label)) : ?>
+						<legend><?php echo JText::_($fieldset->label); ?></legend>
 					<?php endif; ?>
-				<?php endforeach; ?>
+					<?php // Iterate through the fields in the set and display them. ?>
+					<?php foreach ($fields as $field) : ?>
+						<?php // If the field is hidden, just display the input. ?>
+						<?php if ($field->hidden) : ?>
+							<?php echo $field->input; ?>
+						<?php else : ?>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $field->label; ?>
+									<?php if (!$field->required && $field->type !== 'Spacer') : ?>
+										<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL'); ?></span>
+									<?php endif; ?>
+								</div>
+								<div class="controls">
+									<?php echo $field->input; ?>
+								</div>
+							</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
 				</fieldset>
 			<?php endif; ?>
 		<?php endforeach; ?>
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate"><?php echo JText::_('JREGISTER'); ?></button>
-				<a class="btn" href="<?php echo JRoute::_(''); ?>" title="<?php echo JText::_('JCANCEL'); ?>"><?php echo JText::_('JCANCEL'); ?></a>
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JREGISTER'); ?>
+				</button>
+				<a class="btn" href="<?php echo JRoute::_(''); ?>" title="<?php echo JText::_('JCANCEL'); ?>">
+					<?php echo JText::_('JCANCEL'); ?>
+				</a>
 				<input type="hidden" name="option" value="com_users" />
 				<input type="hidden" name="task" value="registration.register" />
 			</div>
diff --git a/components/com_users/views/remind/tmpl/default.php b/components/com_users/views/remind/tmpl/default.php
index 3a2acffae6817..9dbcc9cde1e11 100644
--- a/components/com_users/views/remind/tmpl/default.php
+++ b/components/com_users/views/remind/tmpl/default.php
@@ -11,37 +11,39 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
 ?>
 <div class="remind<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
-	<div class="page-header">
-		<h1>
-			<?php echo $this->escape($this->params->get('page_heading')); ?>
-		</h1>
-	</div>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
 	<?php endif; ?>
-
 	<form id="user-registration" action="<?php echo JRoute::_('index.php?option=com_users&task=remind.remind'); ?>" method="post" class="form-validate form-horizontal well">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
-		<fieldset>
-			<p><?php echo JText::_($fieldset->label); ?></p>
-			<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
-				<?php if ($field->hidden === false) : ?>
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $field->label; ?>
-						</div>
-						<div class="controls">
-							<?php echo $field->input; ?>
+			<fieldset>
+				<p><?php echo JText::_($fieldset->label); ?></p>
+				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
+					<?php if ($field->hidden === false) : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $field->label; ?>
+							</div>
+							<div class="controls">
+								<?php echo $field->input; ?>
+							</div>
 						</div>
-					</div>
-				<?php endif; ?>
-			<?php endforeach; ?>
-		</fieldset>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</fieldset>
 		<?php endforeach; ?>
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate"><?php echo JText::_('JSUBMIT'); ?></button>
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
 			</div>
 		</div>
 		<?php echo JHtml::_('form.token'); ?>
diff --git a/components/com_users/views/reset/tmpl/complete.php b/components/com_users/views/reset/tmpl/complete.php
index a49bde30bf1aa..8dd794d08f61d 100644
--- a/components/com_users/views/reset/tmpl/complete.php
+++ b/components/com_users/views/reset/tmpl/complete.php
@@ -11,6 +11,7 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
 ?>
 <div class="reset-complete<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
@@ -20,7 +21,6 @@
 			</h1>
 		</div>
 	<?php endif; ?>
-
 	<form action="<?php echo JRoute::_('index.php?option=com_users&task=reset.complete'); ?>" method="post" class="form-validate form-horizontal well">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
@@ -37,10 +37,11 @@
 				<?php endforeach; ?>
 			</fieldset>
 		<?php endforeach; ?>
-
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate"><?php echo JText::_('JSUBMIT'); ?></button>
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
 			</div>
 		</div>
 		<?php echo JHtml::_('form.token'); ?>
diff --git a/components/com_users/views/reset/tmpl/confirm.php b/components/com_users/views/reset/tmpl/confirm.php
index faa54f975b44f..562dfb5b95ff1 100644
--- a/components/com_users/views/reset/tmpl/confirm.php
+++ b/components/com_users/views/reset/tmpl/confirm.php
@@ -11,6 +11,7 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
 ?>
 <div class="reset-confirm<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
@@ -20,7 +21,6 @@
 			</h1>
 		</div>
 	<?php endif; ?>
-
 	<form action="<?php echo JRoute::_('index.php?option=com_users&task=reset.confirm'); ?>" method="post" class="form-validate form-horizontal well">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
@@ -37,10 +37,11 @@
 				<?php endforeach; ?>
 			</fieldset>
 		<?php endforeach; ?>
-
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate"><?php echo JText::_('JSUBMIT'); ?></button>
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
 			</div>
 		</div>
 		<?php echo JHtml::_('form.token'); ?>
diff --git a/components/com_users/views/reset/tmpl/default.php b/components/com_users/views/reset/tmpl/default.php
index dbd2604fb1e71..694d3a4ee7a90 100644
--- a/components/com_users/views/reset/tmpl/default.php
+++ b/components/com_users/views/reset/tmpl/default.php
@@ -11,16 +11,16 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
 ?>
 <div class="reset<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
-	<div class="page-header">
-		<h1>
-			<?php echo $this->escape($this->params->get('page_heading')); ?>
-		</h1>
-	</div>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
 	<?php endif; ?>
-
 	<form id="user-registration" action="<?php echo JRoute::_('index.php?option=com_users&task=reset.request'); ?>" method="post" class="form-validate form-horizontal well">
 		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<fieldset>
@@ -39,10 +39,11 @@
 				<?php endforeach; ?>
 			</fieldset>
 		<?php endforeach; ?>
-
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary validate"><?php echo JText::_('JSUBMIT'); ?></button>
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
 			</div>
 		</div>
 		<?php echo JHtml::_('form.token'); ?>