diff --git a/users/forms.py b/users/forms.py
index c044ca3..08f1914 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -46,8 +46,8 @@ class Validation(forms.ModelForm):
 		return password2	
 
 class RegisterUserForm(Validation):
-    new_password = forms.CharField(label=_('Password'), widget = forms.PasswordInput(render_value=True))
-    password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput(render_value=True))
+    new_password = forms.CharField(label=_('Password'), widget = forms.PasswordInput(render_value = True, attrs = {'placeholder': _('Password') + ' *'}))
+    password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput(render_value = True, attrs = {'placeholder': _('Confirm Password') + ' *'}))
 
     is_edit = False
 
@@ -63,6 +63,12 @@ class RegisterUserForm(Validation):
     class Meta:
         model = User
         fields = ['email', 'username', 'last_name', 'social_name', 'image', 'show_email', ]
+        widgets = {
+        	'email': forms.TextInput(attrs = {'placeholder': _('Email') + ' *'}),
+        	'username': forms.TextInput(attrs = {'placeholder': _('Name') + ' *'}),
+        	'last_name': forms.TextInput(attrs = {'placeholder': _('Last Name') + ' *'}),
+        	'social_name': forms.TextInput(attrs = {'placeholder': _('Social Name')}),
+        }
 
 class ProfileForm(Validation):
 	is_edit = True
@@ -157,7 +163,7 @@ class ChangePassForm(Validation):
 		}
 
 class PassResetRequest(forms.Form):
-	email = forms.CharField(label = _('Email'), max_length = 254)
+	email = forms.EmailField(label = _('Email'), max_length = 254, widget = forms.TextInput(attrs = {'placeholder': _('Email') + ' *'}))
 
 	def clean_email(self):
 		email = self.cleaned_data.get('email', '')
diff --git a/users/templates/users/forgot_password.html b/users/templates/users/forgot_password.html
index 2a69f27..a032d95 100644
--- a/users/templates/users/forgot_password.html
+++ b/users/templates/users/forgot_password.html
@@ -46,13 +46,7 @@
           				{% for field in form %}
           					<div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
 	          					<div class="form-group{% if form.has_error %} has-error {% endif %}">
-	          						{% if field.field.required %}
-										<label for="{{ field.auto_id }}" class="control-label">{{ field.label }} <span>*</span></label>
-									{% else %}
-										<label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
-									{% endif %}
-									
-                                    {% render_field field class='form-control' %}
+	          						{% render_field field class='form-control' %}
 									
                                     <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 									
diff --git a/users/templates/users/register.html b/users/templates/users/register.html
index f0f10f2..2562a27 100644
--- a/users/templates/users/register.html
+++ b/users/templates/users/register.html
@@ -45,17 +45,11 @@
 						{% for field in form %}
 							<div class="col-lg-12 col-md-12 col-sm-12">
 								<div class="form-group form-group-sm">
-									{% if field.field.required %}
-										<label for="{{ field.auto_id }}" class="col-md-2 col-sm-2 col-xs-3 col-lg-2 control-label">{{ field.label }}<span>*</span></label>
-									{% else %}
-										<label for="{{ field.auto_id }}" class="col-md-2 col-sm-2 col-xs-3 col-lg-2 control-label">{{ field.label }}</label>
-									{% endif %}
-
-									<div class="col-md-10 col-sm-10 col-xs-9 col-lg-10">
+									<div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
 										{% if field.auto_id == 'id_image' %}
 											{% render_field field class='form-control' %}
 											<div class="input-group">
-							                    <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
+							                    <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
 							                    <span class="input-group-btn">
 							                        <button type="button" class="btn btn-fab btn-fab-mini">
 							                          	<i class="material-icons">attach_file</i>
@@ -63,6 +57,10 @@
 							                    </span>
 							                </div>
 							            {% else %}
+							            	{% if field.auto_id == 'id_show_email' %}
+							            		<label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
+							            	{% endif %}
+
 											{% render_field field class='form-control' %}
 										{% endif %}
 										<span class="help-block">{{ field.help_text }}</span>
--
libgit2 0.21.2