diff --git a/Makefile b/Makefile
index 772dc2a0..f622132d 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ compilemessages:
 	-@ipython manage.py compilemessages
 
 collectstatic:
-	@ipython manage.py collectstatic
+	@ipython manage.py collectstatic --noinput
 
 user:
 	-@ipython manage.py createsuperuser
diff --git a/accounts/forms.py b/accounts/forms.py
index f988485f..43cfa1a7 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -7,7 +7,7 @@ from random import choice
 from django import forms
 from django.contrib.auth.forms import ReadOnlyPasswordHashField
 from django.forms.util import ErrorList
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _, ugettext_lazy
 from django.conf import settings
 from models import User
 from django.db.models import Q
@@ -161,14 +161,14 @@ class ChangePasswordForm(forms.Form):
     """
     old_password = forms.CharField(label=_(u'Old password'), required=True,
                                    widget=forms.PasswordInput(render_value=False,
-                                                              attrs={'placeholder': _(u'Введите старый пароль')}))
+                                                              attrs={'placeholder': ugettext_lazy(u'Введите старый пароль')}))
     new_password = forms.CharField(label=_(u'New password'), required=True,
                                    widget=forms.PasswordInput(render_value=False,
-                                                              attrs={'placeholder': _(u'Придумайте новый пароль')}))
+                                                              attrs={'placeholder': ugettext_lazy(u'Придумайте новый пароль')}))
     new_password_confirm = forms.CharField(label=_(u'Confirm password'), required=True,
                                            widget=forms.PasswordInput(render_value=False,
                                                                       attrs={
-                                                                          'placeholder': _(u'Повторите новый пароль')}))
+                                                                          'placeholder': ugettext_lazy(u'Повторите новый пароль')}))
 
     def clean(self):
         data = super(ChangePasswordForm, self).clean()
diff --git a/templates/client/accounts/settings.html b/templates/client/accounts/settings.html
index 14c1d069..3095fc37 100644
--- a/templates/client/accounts/settings.html
+++ b/templates/client/accounts/settings.html
@@ -1,7 +1,5 @@
 {% extends 'client/base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
+{% load static i18n %}
 
 {% block bread_scrumbs %}
    <div class="bread-crumbs">
@@ -17,29 +15,28 @@
        </div>
 {% endblock %}
 
-
 {% block content_list %}
        {% if user.email %}
        <div class="set-sect ch-pwd">
-			<header>{% trans 'смена пароля' %}</header>
-			<div class="set-sect-body">
-				<form id="paswd_change" class="pw-form" method="post" action="#">{% csrf_token %}
-					<div class="mf-line">
-						<div class="mf-field">
+            <header>{% trans 'смена пароля' %}</header>
+            <div class="set-sect-body">
+                <form id="paswd_change" class="pw-form" method="post" action="#">{% csrf_token %}
+                    <div class="mf-line">
+                        <div class="mf-field">
                             {{ change_password_form.old_password }}
-						</div>
-					</div>
+                        </div>
+                    </div>
 
-					<div class="mf-line">
-						<div class="mf-field">
+                    <div class="mf-line">
+                        <div class="mf-field">
                             {{ change_password_form.new_password }}
-						</div>
+                        </div>
 
-						<div class="mf-field">
+                        <div class="mf-field">
                             {{ change_password_form.new_password_confirm }}
-						</div>
+                        </div>
 
-					</div>
+                    </div>
 
                     <div class="mf-line">
                         <div class="mf-success">
@@ -48,68 +45,68 @@
 
                     </div>
 
-					<div class="mf-buttons-line">
-						<button type="submit" class="icon-save">{% trans 'сохранить' %}</button>
-					</div>
-				</form>
-			</div>
-		</div>
+                    <div class="mf-buttons-line">
+                        <button type="submit" class="icon-save">{% trans 'сохранить' %}</button>
+                    </div>
+                </form>
+            </div>
+        </div>
        {% endif %}
 
         <!--
        <div class="set-sect">
-			<header>{% trans 'социализация и sharing' %}</header>
-		    <div class="set-sect-body">
-			<form action="#">
-
-			<div class="mf-soc-m clearfix">
-		        <div class="mf-soc-col">
-				    <div class="mfsm-title">Подключено:</div>
-					<div class="mf-line">
-						<div class="sm-i"><img src="img/soc-medias/icon-fb.png" alt="" /> Artem Zubkevich</div>
-												<a class="clear" href="#">очистить</a>
-					</div>
-					<div class="mf-line">
-						<div class="sm-i"><img src="img/soc-medias/icon-twit.png" alt="" /> @zubkevich</div>
-						<a class="clear" href="#">очистить</a>
-					</div>
-				</div>
-
-			    <div class="mf-soc-col">
-					<div class="mfsm-title">Подключить:</div>
-
-					<div class="sm-body">
-					    <ul>
+            <header>{% trans 'социализация и sharing' %}</header>
+            <div class="set-sect-body">
+            <form action="#">
+
+            <div class="mf-soc-m clearfix">
+                <div class="mf-soc-col">
+                    <div class="mfsm-title">Подключено:</div>
+                    <div class="mf-line">
+                        <div class="sm-i"><img src="img/soc-medias/icon-fb.png" alt="" /> Artem Zubkevich</div>
+                                                <a class="clear" href="#">очистить</a>
+                    </div>
+                    <div class="mf-line">
+                        <div class="sm-i"><img src="img/soc-medias/icon-twit.png" alt="" /> @zubkevich</div>
+                        <a class="clear" href="#">очистить</a>
+                    </div>
+                </div>
+
+                <div class="mf-soc-col">
+                    <div class="mfsm-title">Подключить:</div>
+
+                    <div class="sm-body">
+                        <ul>
                             <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-fb.png' %}" alt="" /></a></li>
                             <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-twit.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-goog.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-lin.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-ok.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-mailr.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-vk.png' %}" alt="" /></a></li>
-						</ul>
-					</div>
-				</div>
-			</div>
-
-			<div class="mf-checks-title">Публиковать на ваши страницы:</div>
-			    <div class="mf-line">
-    				<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки, конференции, семинары в которых я я участвую</label>
-				</div>
-
-				<div class="mf-line">
-				    <label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки, конференции, семинары которые я собираюсь посетить</label>
-				</div>
-
-				<div class="mf-line">
-					<label class="check"><input type="checkbox" name="sType" value="exhb" />Фотографии на которых я отмечен</label>
-				</div>
-
-				<div class="mf-buttons-line">
-					<button class="icon-save">сохранить</button>
-				</div>
-			</form>
-		</div>
+                            <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-goog.png' %}" alt="" /></a></li>
+                            <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-lin.png' %}" alt="" /></a></li>
+                            <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-ok.png' %}" alt="" /></a></li>
+                            <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-mailr.png' %}" alt="" /></a></li>
+                            <li><a href="#"><img src="{% static 'client/img/soc-medias/icon-vk.png' %}" alt="" /></a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
+            <div class="mf-checks-title">Публиковать на ваши страницы:</div>
+                <div class="mf-line">
+                    <label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки, конференции, семинары в которых я я участвую</label>
+                </div>
+
+                <div class="mf-line">
+                    <label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки, конференции, семинары которые я собираюсь посетить</label>
+                </div>
+
+                <div class="mf-line">
+                    <label class="check"><input type="checkbox" name="sType" value="exhb" />Фотографии на которых я отмечен</label>
+                </div>
+
+                <div class="mf-buttons-line">
+                    <button class="icon-save">сохранить</button>
+                </div>
+            </form>
+        </div>
     </div>
         -->
 {#    <div class="set-sect subscribe">#}
@@ -245,7 +242,7 @@
 
             });
             });
-	    </script>
+        </script>
     {% endblock %}
 {% endblock %}