diff --git a/pybossa/forms/account_view_forms.py b/pybossa/forms/account_view_forms.py
index 3470d7a..4a15dc8 100644
--- a/pybossa/forms/account_view_forms.py
+++ b/pybossa/forms/account_view_forms.py
@@ -24,4 +24,5 @@ from forms import (
     ChangePasswordForm,
     ResetPasswordForm,
     ForgotPasswordForm,
-    AvatarUploadForm)
+    AvatarUploadForm,
+    AvatarUploadRegisterForm)
diff --git a/pybossa/forms/forms.py b/pybossa/forms/forms.py
index c948ba0..3523d37 100644
--- a/pybossa/forms/forms.py
+++ b/pybossa/forms/forms.py
@@ -392,3 +392,11 @@ class AvatarUploadForm(Form):
     y1 = IntegerField(label=None, widget=HiddenInput(), default=0)
     x2 = IntegerField(label=None, widget=HiddenInput(), default=0)
     y2 = IntegerField(label=None, widget=HiddenInput(), default=0)
+
+class AvatarUploadRegisterForm(Form):
+    id = IntegerField(label=None, widget=HiddenInput())
+    avatar = FileField(lazy_gettext('Avatar (optional)'))
+    x1 = IntegerField(label=None, widget=HiddenInput(), default=0)
+    y1 = IntegerField(label=None, widget=HiddenInput(), default=0)
+    x2 = IntegerField(label=None, widget=HiddenInput(), default=0)
+    y2 = IntegerField(label=None, widget=HiddenInput(), default=0)
diff --git a/pybossa/themes/default/static/css/theme.css b/pybossa/themes/default/static/css/theme.css
index 9626648..6411aea 100644
--- a/pybossa/themes/default/static/css/theme.css
+++ b/pybossa/themes/default/static/css/theme.css
@@ -310,10 +310,12 @@ h6 small {
  color: #6F9CA2;
  background-color: #d9edf7;
  border-color: #d9edf7;
+}
 .alert-warning {
  color: #B59D5A;
  background-color: #FFE7AB;
  border-color: #FFE7AB;
+}
 .alert-danger {
  color: #A45E4D;
  background-color: #F8AFAB;
@@ -326,11 +328,9 @@ h6 small {
   background-color: blue;
   border: 1px solid #ddd;
 }
-/*
-.carousel-indicators li {
-    border: solid 1px #34495E;
+.upload-container {
+  padding-bottom: 30px;
 }
-.carousel-indicators .active {
-    background-color: #34495E;
+.upload-container .form-actions {
+  padding-top: 10px;
 }
-*/
diff --git a/pybossa/themes/default/templates/_navbar.html b/pybossa/themes/default/templates/_navbar.html
index bbcc215..88d433e 100644
--- a/pybossa/themes/default/templates/_navbar.html
+++ b/pybossa/themes/default/templates/_navbar.html
@@ -12,13 +12,7 @@
 
         <div class="collapse navbar-collapse" id="main-navbar-collapse">
           <ul class="nav navbar-nav">
-            <!-- Link para a página da Comunidade
-            <li {% if active_page == 'community' %} class="active" {% endif %}><a href="{{ url_for('account.index')}}">{{ _('Community') }}</a></li>
-            -->
             <li {% if active_page == 'projects' %} class="active" {% endif %}><a href="{{ url_for('project.index') }}">{{ _('Projects') }}</a></li>
-            <!--
-            <li {% if active_page == 'create' %} class="active" {% endif %}><a href="{{ url_for('project.new') }}">{{ _('Create') }}</a></li>
-             -->
             <li {% if active_page == 'about' %} class="active" {% endif %}><a href="{{ url_for('home.about')}}">{{ _('About') }}</a></li>
           </ul>
           {% include '_gcs_form.html' ignore missing %}
@@ -27,7 +21,9 @@
               <li {% if active_page == 'profile' %} class="active" {% endif %}><a href="#" data-toggle="dropdown" class="dropdown-toggle"><i class="icon icon-user"></i> {{ current_user.name }} <span class="caret"></span></a>
                 <ul class="dropdown-menu">
                     <li><a href="{{ url_for('account.profile', name=current_user.name) }}"><i class="icon icon-user"></i> {{ _('My Profile') }}</a></li>
+                    {% if current_user.admin == 1 %}
                     <li><a href="{{ url_for('account.projects', name=current_user.name) }}"><i class="icon icon-th-large"></i> {{ _('My Projects') }}</a></li>
+                    {% endif %}
                     <li><a href="{{ url_for('account.update_profile', name=current_user.name) }}"><i class="icon icon-cog"></i> {{ _('My Settings') }}</a></li>
                     {% if current_user.admin == 1 %}
                     <li class="divider"></li>
diff --git a/pybossa/themes/default/templates/account/_helpers.html b/pybossa/themes/default/templates/account/_helpers.html
index 6ffed8f..b1bc804 100644
--- a/pybossa/themes/default/templates/account/_helpers.html
+++ b/pybossa/themes/default/templates/account/_helpers.html
@@ -3,7 +3,9 @@
   <div class="container">
     <ul class="nav nav-pills nav-justified nav-pills-inverse">
         <li role="presentation" {% if active_link=="profile"%}class="active"{% endif %}><a href="{{url_for('account.profile', name=current_user.name)}}">{{ _('My Profile') }}</a></li>
+        {% if current_user.admin %}
         <li role="presentation" {% if active_link=="projects"%}class="active"{% endif %}><a href="{{url_for('account.projects', name=current_user.name)}}">{{ _('My Projects') }}</a></li>
+        {% endif %}
         <li role="presentation" {% if active_link=="settings"%}class="active"{% endif %}><a href="{{url_for('account.update_profile', name=current_user.name)}}">{{ _('My Settings') }}</a></li>
         {% if current_user.admin %}
         <li role="presentation" {% if active_link=="admin"%}class="active"{% endif %}><a href="{{url_for('admin.index')}}">{{ _('Admin Site') }}</a></li>
@@ -87,7 +89,7 @@
 {% endmacro %}
 
 {% macro render_user_thumbnail(user, upload_method, id, class, style) %}
-    {% if user.info.avatar %}
+    {% if user.info and user.info.avatar %}
         {% if upload_method == 'rackspace'%}
         <img id="{{id}}" class="{{class}}" style="{{style}}" width="100%" src="{{ url_for('rackspace', filename=user.info.avatar, container=user.info.container)}}" onerror="imgError(this, 'user');">
         {% else %}
@@ -98,6 +100,14 @@
     {% endif %}
 {% endmacro %}
 
+{% macro render_registering_user_thumbnail(user, upload_method, avatar_upload_id) %}
+	{% if avatar_upload_id and avatar_upload_id != '' %}
+		<img width="100%" src="{{ url_for('uploads.uploaded_file', filename=('tmp/' ~ avatar_upload_id + '_avatar.png'))}}">
+	{% else %}
+        {{ render_user_thumbnail(user, upload_method) }}
+    {% endif %}
+{% endmacro %}
+
 {% macro render_pagination(pagination) %}
   <nav>
       <ul class="pagination pagination-centered">
diff --git a/pybossa/themes/default/templates/account/register.html b/pybossa/themes/default/templates/account/register.html
index 8c6ffce..ece9d85 100644
--- a/pybossa/themes/default/templates/account/register.html
+++ b/pybossa/themes/default/templates/account/register.html
@@ -1,7 +1,14 @@
 {% extends "base.html" %}
+{% import "account/_helpers.html" as helper %}
 
-{% block content %}<div class="container">
+{% block content %}
+
+<div class="container">
 {% from "_formhelpers.html" import render_field %}
+<script src="{{url_for('static', filename='js/vendor/jquery.Jcrop.min.js')}}"></script>
+<script src="{{url_for('static', filename='js/image_crop.js')}}" type="text/javascript"></script>
+<link rel="stylesheet" href="{{url_for('static', filename='css/jquery.Jcrop.min.css')}}" type="text/css" />
+
 <p style="padding-top:5px;">
 <span class="label label-warning"><i class="glyphicon glyphicon-bullhorn"></i> {{ _('Note') }}</span> 
     {{ _('By click the') }} 
@@ -12,8 +19,23 @@
 </p>
 
   <legend>{{ _('Create an account') }}</legend>
-  <form method="post" class="form-horizontal" action="{{ url_for('account.register') }}">
+  <form method="post" class="form-horizontal" action="{{ url_for('account.register') }}" enctype="multipart/form-data">
       {{ form.hidden_tag() }}
+     <fieldset class="upload-container">
+         <div class="col-md-2 img-thumbnail">
+          {{ form.hidden_tag() }}
+          {{ helper.render_registering_user_thumbnail(current_user, upload_method, avatar_upload_id)}}
+         </div>
+	     {{ render_field(upload_form.avatar, onchange="previewImage()") }}
+	     {{ upload_form.x1 }}
+	     {{ upload_form.y1 }}
+	     {{ upload_form.x2 }}
+	     {{ upload_form.y2 }}
+	     <img id="uploadPreview">
+	     <div class="form-actions">
+	         <button type="submit" name='btn' value="Upload" class="btn btn-primary btn-lg" />{{ _('Upload') }}</button>
+	     </div>
+      </fieldset>
       <fieldset>
       {{ render_field(form.fullname, placeholder= _('my full name')) }}
       {{ render_field(form.name, placeholder= _('myusername')) }}
@@ -21,6 +43,7 @@
       {{ render_field(form.password, placeholder= _('my secret password')) }}
       {{ render_field(form.confirm, placeholder= _('my secret password')) }}
       {{ render_field(form.profile) }}
+      <input id="avatar_upload_id" name="avatar_upload_id" type="hidden" value="{{ avatar_upload_id }}">
       <div class="form-actions">
         <input type="submit" value="{{ _('Create an account') }}" class="btn btn-primary btn-lg" />
         <input type="reset" value="{{ _('Cancel') }}" class="btn btn-default" />
@@ -28,4 +51,5 @@
       </fieldset>
   </form>
 <script src="{{url_for('static', filename='js/forms.js')}}" type="text/javascript"></script>
-</div>{% endblock %}
+</div>
+{% endblock %}
diff --git a/pybossa/themes/default/templates/account/update.html b/pybossa/themes/default/templates/account/update.html
index 37ba6b4..74822b4 100644
--- a/pybossa/themes/default/templates/account/update.html
+++ b/pybossa/themes/default/templates/account/update.html
@@ -19,15 +19,15 @@
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
             {{ helper.render_user_thumbnail(current_user, upload_method)}}
             </div>
-        {{ render_field(upload_form.avatar, onchange="previewImage()") }}
-        {{ upload_form.x1 }}
-        {{ upload_form.y1 }}
-        {{ upload_form.x2 }}
-        {{ upload_form.y2 }}
-        <img id="uploadPreview">
-        <div class="form-actions">
-            <button type="submit" name='btn' value="Upload" class="btn btn-primary btn-lg" />{{ _('Upload') }}</button>
-        </div>
+	        {{ render_field(upload_form.avatar, onchange="previewImage()") }}
+	        {{ upload_form.x1 }}
+	        {{ upload_form.y1 }}
+	        {{ upload_form.x2 }}
+	        {{ upload_form.y2 }}
+	        <img id="uploadPreview">
+	        <div class="form-actions">
+	            <button type="submit" name='btn' value="Upload" class="btn btn-primary btn-lg" />{{ _('Upload') }}</button>
+	        </div>
         </fieldset>
     </form>
     <form method="post" class="form-horizontal" action="{{ url_for('account.update_profile', name=current_user.name) }}">
diff --git a/pybossa/themes/default/templates/projects/presenter.html b/pybossa/themes/default/templates/projects/presenter.html
index 01df14f..f59c7aa 100644
--- a/pybossa/themes/default/templates/projects/presenter.html
+++ b/pybossa/themes/default/templates/projects/presenter.html
@@ -14,19 +14,8 @@
     <div class="col-md-12">
     </div>
 </div>
-<!--
-{% if invite_new_volunteers %}
-<div class="row">
-    <div class="col-md-12">
-        <p>
-        {{ _("Sorry, you've contributed to all the tasks for this project, but this project still needs more volunteers, so please spread the word!") }}
-        </p>
-    </div>
-</div>
-{% endif %}
- -->
-{{ project.info.task_presenter|safe }}
 
+{{ project.info.task_presenter|safe }}
 
 <div id='PYBOSSA_USER_LOCALE' hidden>
 {% if current_user.is_anonymous() %}
diff --git a/pybossa/themes/default/templates/projects/update-bak.html b/pybossa/themes/default/templates/projects/update-bak.html
deleted file mode 100644
index 00451ed..0000000
--- a/pybossa/themes/default/templates/projects/update-bak.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% extends "/base.html" %}
-{% set active_page = "projects" %}
-{% import "projects/_helpers.html" as helper %}
-
-{% block content %}
-
-{% from "_formhelpers.html" import render_field %}
-{{ helper.render_project_local_nav(project, 'settings', current_user) }}
-
-<script src="{{url_for('static', filename='js/vendor/jquery.Jcrop.min.js')}}"></script>
-<link rel="stylesheet" href="{{url_for('static', filename='css/jquery.Jcrop.min.css')}}" type="text/css" />
-<div class="container">
-  {{helper.render_project_title(project, upload_method, subtitle=_('Update the project')) }}
-      <!-- Update form for project thumbnail -->
-      <form method="post" class="form-horizontal" action="{{ url_for('project.update', short_name=project.short_name) }}" enctype="multipart/form-data">
-          <fieldset>
-              <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-              <p class="text-center">
-                {{ helper.render_project_thumbnail(project, upload_method, id="uploadPreview") }}
-              </p>
-              {{ render_field(upload_form.avatar, onchange="previewImage()") }}
-              {{ upload_form.x1 }}
-              {{ upload_form.y1 }}
-              {{ upload_form.x2 }}
-              {{ upload_form.y2 }}
-          <div class="form-actions">
-            <button type="submit" name='btn' value="Upload" class="btn btn-primary btn-lg">{{ _('Upload') }}</button>
-          </div>
-          </fieldset>
-      </form>
-
-      <!-- Update form for project data-->
-    <form class="form-horizontal" method="post" action="{{ url_for('project.update', short_name = project.short_name) }}">
-      <fieldset>
-        {{ form.hidden_tag() }}
-        {{ render_field(form.name, class_="input-xlarge", placeholder=_('The name of the project')) }}
-        {{ render_field(form.short_name, class_="input-xlarge", placeholder=_('Short name or slug for the project'), label_text=_('Project slug:')) }}
-        {{ render_field(form.description, class_="input-xlarge", placeholder=_('Give some details about the project')) }}
-        {{ render_field(form.long_description, class_="input-xlarge", placeholder=_('Explain the project (use Markdown!)')) }}
-        {{ render_field(form.category_id) }}
-        {{ render_field(form.allow_anonymous_contributors) }}
-        {{ render_field(form.password) }}
-        {{ render_field(form.webhook) }}
-        {{ render_field(form.hidden, tooltip=_('Do you want to hide your project?')) }}
-        <div class="form-actions">
-          <button type="submit" name='btn' value="Save the changes" class="btn btn-primary">{{_('Save te changes')}}</button>
-          <a href="{{url_for('project.settings', short_name=project.short_name)}}" class="btn btn-default">{{_('Cancel')}}</a>
-        </div>
-      </fieldset>
-    </form>
-<script>
-    $("i[rel='tooltip']").tooltip();
-</script>
-<script src="{{url_for('static', filename='js/image_crop.js')}}" type="text/javascript"></script>
-{{ helper.broken_image() }}
-</div>{% endblock %}
diff --git a/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.mo b/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.mo
index 039297b..043997d 100644
Binary files a/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.mo and b/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.po b/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.po
index d32c54b..654d865 100644
--- a/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.po
@@ -341,6 +341,9 @@ msgstr "Usuário"
 msgid "Avatar"
 msgstr "Avatar"
 
+msgid "Avatar (optional)"
+msgstr "Avatar (opcional)"
+
 #: forms/validator.py:34
 msgid "This item already exists"
 msgstr "Este item já existe"
@@ -2462,6 +2465,9 @@ msgid "Your avatar has been updated! It may                       take some minu
 msgstr ""
 "Seu avatar está sendo atualizado! pode                     demorar alguns minutos para atualização..."
 
+msgid "Your avatar has been uploaded!"
+msgstr "Feito o upload do avatar."
+
 #: view/account.py:478
 #, python-format
 msgid ""
diff --git a/pybossa/uploader/__init__.py b/pybossa/uploader/__init__.py
index 513720d..83a1506 100644
--- a/pybossa/uploader/__init__.py
+++ b/pybossa/uploader/__init__.py
@@ -122,3 +122,7 @@ class Uploader(object):
     def file_exists(self, name, container):  #pragma: no cover
         """Override by the uploader handler."""
         pass
+    
+    def move_file(self, name, container, dest_name, dest_container):  #pragma: no cover
+        """Override by the uploader handler."""
+        pass
diff --git a/pybossa/uploader/local.py b/pybossa/uploader/local.py
index be978d8..9b25271 100644
--- a/pybossa/uploader/local.py
+++ b/pybossa/uploader/local.py
@@ -80,3 +80,18 @@ class LocalUploader(Uploader):
             return os.path.isfile(path)
         except Exception:
             return False
+
+    def move_file(self, name, container, dest_name, dest_container):
+        """Move a file if it exists."""
+        try:
+            path = os.path.join(self.upload_folder, container, name)
+            dest_dir = os.path.join(self.upload_folder, dest_container)
+            dest_path = os.path.join(self.upload_folder, dest_container, dest_name)
+            if self.file_exists(name, container):
+                if not os.path.isdir(dest_dir):
+                    os.makedirs(dest_dir)
+                os.rename(path, dest_path)
+                return True
+            return False
+        except Exception:
+            return False
diff --git a/pybossa/view/account.py b/pybossa/view/account.py
index 8134fa3..50363bc 100644
--- a/pybossa/view/account.py
+++ b/pybossa/view/account.py
@@ -203,25 +203,34 @@ def register():
     if profiles is None:
         profiles = user_repo.get_profiles_list()
     form.set_profile_choices(profiles)
-    if request.method == 'POST' and form.validate():
-        account = dict(fullname=form.fullname.data, name=form.name.data,
-                       email_addr=form.email_addr.data,
-                       password=form.password.data, profile=form.profile.data,
-                       locale=current_app.config.get('DEFAULT_LOCALE'))
-        confirm_url = get_email_confirmation_url(account)
-        if current_app.config.get('ACCOUNT_CONFIRMATION_DISABLED'):
-            return _create_account(account)
-        msg = dict(subject='Welcome to %s!' % current_app.config.get('BRAND'),
-                   recipients=[account['email_addr']],
-                   body=render_template('/account/email/validate_account.md',
-                                        user=account, confirm_url=confirm_url))
-        msg['html'] = markdown(msg['body'])
-        mail_queue.enqueue(send_mail, msg)
-        return render_template('account/account_validation.html')
-    if request.method == 'POST' and not form.validate():
-        flash(gettext('Please correct the errors'), 'error')
+    avatar_form = AvatarUploadRegisterForm()
+    avatar_upload_id = ''
+
+    if request.method == 'POST':
+        # Update user avatar
+        if request.form.get('btn') == 'Upload':
+            avatar_upload_id = _handle_avatar_update_on_register(avatar_form, request.form['avatar_upload_id'])
+        elif form.validate():
+            account = dict(fullname=form.fullname.data, name=form.name.data,
+                           email_addr=form.email_addr.data,
+                           password=form.password.data, profile=form.profile.data,
+                           locale=current_app.config.get('DEFAULT_LOCALE'),
+                           avatar_upload_id=request.form['avatar_upload_id'])
+            confirm_url = get_email_confirmation_url(account)
+            if current_app.config.get('ACCOUNT_CONFIRMATION_DISABLED'):
+                return _create_account(account)
+            msg = dict(subject='Welcome to %s!' % current_app.config.get('BRAND'),
+                       recipients=[account['email_addr']],
+                       body=render_template('/account/email/validate_account.md',
+                                            user=account, confirm_url=confirm_url))
+            msg['html'] = markdown(msg['body'])
+            mail_queue.enqueue(send_mail, msg)
+            return render_template('account/account_validation.html')
+        else:
+            flash(gettext('Please correct the errors'), 'error')
     return render_template('account/register.html',
-                           title=gettext("Register"), form=form)
+                           title=gettext("Register"),
+                           form=form, upload_form=avatar_form, avatar_upload_id=avatar_upload_id)
 
 
 @blueprint.route('/newsletter')
@@ -285,10 +294,45 @@ def _create_account(user_data):
                                locale=user_data['locale'])
     new_user.set_password(user_data['password'])
     user_repo.save(new_user)
+    _update_user_info_on_register(new_user, user_data['avatar_upload_id'])
+
     flash(gettext('Thanks for signing-up'), 'success')
     return _sign_in_user(new_user)
 
 
+def _handle_avatar_update_on_register(avatar_form, avatar_upload_id):
+    if avatar_form.validate_on_submit():
+        container = "tmp"
+         # Delete previous avatar from storage
+        if avatar_upload_id != '':
+            uploader.delete_file("%s_avatar.png" % avatar_upload_id, container)
+
+        _file = request.files['avatar']
+        coordinates = (avatar_form.x1.data, avatar_form.y1.data,
+                       avatar_form.x2.data, avatar_form.y2.data)
+        avatar_upload_id = time.time()
+        _file.filename = "%s_avatar.png" % avatar_upload_id
+        uploader.upload_file(_file,
+                             container=container,
+                             coordinates=coordinates)
+        flash(gettext('Your avatar has been uploaded!'), 'success')
+        return str(avatar_upload_id)
+    else:
+        flash("You have to provide an image file to update your avatar", "error")
+        return ''
+
+def _update_user_info_on_register(new_user, avatar_upload_id):
+    if avatar_upload_id == '':
+        return
+    user = user_repo.get_by_name(new_user.name)
+    avatar = "%s_avatar.png" % avatar_upload_id
+    container = "user_%s" % user.id
+    user.info = {'avatar': avatar,
+                             'container': container}
+    uploader.move_file(avatar, "tmp", avatar, container)
+    user_repo.update(user)
+
+
 def _update_user_with_valid_email(user, email_addr):
     user.valid_email = True
     user.confirmation_email_sent = False
diff --git a/tmp/.gitempty b/tmp/.gitempty
deleted file mode 100644
index e69de29..0000000
--- a/tmp/.gitempty
+++ /dev/null
--
libgit2 0.21.2