diff --git a/administrator/components/com_users/models/forms/user.xml b/administrator/components/com_users/models/forms/user.xml
index 61cbbcf5dd7a0..85217f3659388 100644
--- a/administrator/components/com_users/models/forms/user.xml
+++ b/administrator/components/com_users/models/forms/user.xml
@@ -105,12 +105,12 @@
 		<field
 				name="block"
 				type="radio"
-				class="btn-group btn-group-yesno"
+				class="btn-group btn-group-yesno btn-group-reversed"
 				default="0"
 				label="COM_USERS_USER_FIELD_BLOCK_LABEL"
 				description="COM_USERS_USER_FIELD_BLOCK_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
+				<option value="1">COM_USERS_USER_FIELD_BLOCK</option>
+				<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
 		</field>
 
 		<field
diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 4454576f0002a..2a55a5b607c1f 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -300,8 +300,13 @@ COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC="Select the Language for the Administ
 COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language"
 COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC="Select the template style for the Administrator Backend interface. This will only affect this User."
 COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL="Backend Template Style"
-COM_USERS_USER_FIELD_BLOCK_DESC="Block this user."
-COM_USERS_USER_FIELD_BLOCK_LABEL="Block this User"
+COM_USERS_USER_FIELD_BLOCK_DESC="Enable or Block this user."
+COM_USERS_USER_FIELD_BLOCK_LABEL="User Status"
+
+COM_USERS_USER_FIELD_ENABLE="Enabled"
+COM_USERS_USER_FIELD_BLOCK="Blocked"
+
+
 COM_USERS_USER_FIELD_EDITOR_DESC="Editor for this user."
 COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
 COM_USERS_USER_FIELD_EMAIL_DESC="Enter an email address for the user."
diff --git a/administrator/templates/isis/js/template.js b/administrator/templates/isis/js/template.js
index 38f5aed4dc67d..5408f32909a43 100644
--- a/administrator/templates/isis/js/template.js
+++ b/administrator/templates/isis/js/template.js
@@ -30,14 +30,40 @@
 			var label = $(this);
 			var input = $('#' + label.attr('for'));
 
-			if (!input.prop('checked')) {
+			if (!input.prop('checked'))
+			{
 				label.closest('.btn-group').find('label').removeClass('active btn-success btn-danger btn-primary');
-				if (input.val() == '') {
-					label.addClass('active btn-primary');
-				} else if (input.val() == 0) {
-					label.addClass('active btn-danger');
-				} else {
-					label.addClass('active btn-success');
+
+				if (label.closest('.btn-group').hasClass('btn-group-reverse'))
+				{
+					if (input.val() == '')
+					{
+						label.addClass('active btn-primary');
+					}
+					else if (input.val() == 0)
+					{
+						label.addClass('active btn-danger');
+					}
+					else
+					{
+						label.addClass('active btn-success');
+					}
+				}
+				else
+				{
+					if (input.val() == '')
+					{
+						label.addClass('active btn-primary');
+					}
+					else if (input.val() == 0)
+					{
+						label.addClass('active btn-success');
+					}
+					else
+					{
+						label.addClass('active btn-danger');
+					}
+
 				}
 				input.prop('checked', true);
 				input.trigger('change');
@@ -45,12 +71,38 @@
 		});
 		$('.btn-group input[checked=checked]').each(function()
 		{
-			if ($(this).val() == '') {
-				$('label[for=' + $(this).attr('id') + ']').addClass('active btn-primary');
-			} else if ($(this).val() == 0) {
-				$('label[for=' + $(this).attr('id') + ']').addClass('active btn-danger');
-			} else {
-				$('label[for=' + $(this).attr('id') + ']').addClass('active btn-success');
+			var $self  = $(this);
+			var attrId = $self.attr('id');
+
+			if ($self.hasClass('btn-group-reverse'))
+			{
+				if ($self.val() == '')
+				{
+					$('label[for=' + attrId + ']').addClass('active btn-primary');
+				}
+				else if ($self.val() == 0)
+				{
+					$('label[for=' + attrId + ']').addClass('active btn-danger');
+				}
+				else
+				{
+					$('label[for=' + attrId + ']').addClass('active btn-success');
+				}
+			}
+			else
+			{
+				if ($self.val() == '')
+				{
+					$('label[for=' + attrId + ']').addClass('active btn-primary');
+				}
+				else if ($self.val() == 0)
+				{
+					$('label[for=' + attrId + ']').addClass('active btn-success');
+				}
+				else
+				{
+					$('label[for=' + attrId + ']').addClass('active btn-danger');
+				}
 			}
 		});
 		// add color classes to chosen field based on value
diff --git a/installation/template/index.php b/installation/template/index.php
index a9249af9dd631..b1edb117bb8b6 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -87,10 +87,12 @@ function initElements()
 					$('.radio.btn-group label').addClass('btn');
 
 					$('fieldset.btn-group').each(function() {
+						var $self = $(this);
 						// Handle disabled, prevent clicks on the container, and add disabled style to each button
-						if ($(this).prop('disabled')) {
-							$(this).css('pointer-events', 'none').off('click');
-							$(this).find('.btn').addClass('disabled');
+						if ($self.prop('disabled'))
+						{
+							$self.css('pointer-events', 'none').off('click');
+							$self.find('.btn').addClass('disabled');
 						}
 					});
 
@@ -101,29 +103,75 @@ function initElements()
 
 						if (!input.prop('checked'))
 						{
-							label.closest('.btn-group').find("label").removeClass('active btn-success btn-danger btn-primary');
-							if(input.val()== '')
+							label.closest('.btn-group').find('label').removeClass('active btn-success btn-danger btn-primary');
+
+							if (label.closest('.btn-group').hasClass('btn-group-reverse'))
 							{
+								if (input.val() == '')
+								{
 									label.addClass('active btn-primary');
-							 } else if(input.val()==0 || input.val()=='remove')
+								}
+								else if (input.val() == 0)
+								{
+									label.addClass('active btn-danger');
+								}
+								else
+								{
+									label.addClass('active btn-success');
+								}
+							}
+							else
 							{
+								if (input.val() == '')
+								{
+									label.addClass('active btn-primary');
+								}
+								else if (input.val() == 0)
+								{
+									label.addClass('active btn-success');
+								}
+								else
+								{
 									label.addClass('active btn-danger');
-							 } else {
-							label.addClass('active btn-success');
-							 }
+								}
+							}
 							input.prop('checked', true);
 						}
 					});
 					$(".btn-group input[checked='checked']").each(function()
 					{
-						if ($(this).val()== '')
+						var $self  = $(this);
+						var attrId = $self.attr('id');
+
+						if ($self.hasClass('btn-group-reverse'))
 						{
-						   $("label[for=" + $(this).attr('id') + "]").addClass('active btn-primary');
-						} else if($(this).val()==0 || $(this).val()=='remove')
+							if ($self.val() == '')
+							{
+								$('label[for=' + attrId + ']').addClass('active btn-primary');
+							}
+							else if ($self.val() == 0)
+							{
+								$('label[for=' + attrId + ']').addClass('active btn-danger');
+							}
+							else
+							{
+								$('label[for=' + attrId + ']').addClass('active btn-success');
+							}
+						}
+						else
 						{
-						   $("label[for=" + $(this).attr('id') + "]").addClass('active btn-danger');
-						} else {
-							$("label[for=" + $(this).attr('id') + "]").addClass('active btn-success');
+							if ($self.val() == '')
+							{
+								$('label[for=' + attrId + ']').addClass('active btn-primary');
+							}
+							else if ($self.val() == 0)
+							{
+								$('label[for=' + attrId + ']').addClass('active btn-success');
+							}
+							else
+							{
+								$('label[for=' + attrId + ']').addClass('active btn-danger');
+							}
 						}
 					});
 				})(jQuery);