diff --git a/src/postorius/templates/postorius/menu/user_nav.html b/src/postorius/templates/postorius/menu/user_nav.html
index 94054ac..c139547 100644
--- a/src/postorius/templates/postorius/menu/user_nav.html
+++ b/src/postorius/templates/postorius/menu/user_nav.html
@@ -5,7 +5,6 @@
     <li role="presentation" class="{% nav_active_class current 'profile' %}"><a href="{% url 'user_profile' %}">{% trans 'Profile' %}</a></li>
     <li role="presentation" class="{% nav_active_class current 'settings' %}"><a href="{% url 'user_mailmansettings' %}">{% trans 'Subscription settings' %}</a></li>
     <li role="presentation" class="{% nav_active_class current 'subscriptions' %}"><a href="{% url 'user_subscriptions' %}">{% trans 'Subscriptions' %}</a></li>
-    <li role="presentation" class="{% nav_active_class current 'add_email' %}"><a href="{% url 'address_activation' %}">{% trans 'Add email address' %}</a></li>
 </ul>
 
 <div class="page-header">
diff --git a/src/postorius/templates/postorius/user/address_activation.html b/src/postorius/templates/postorius/user/address_activation.html
deleted file mode 100644
index e97586a..0000000
--- a/src/postorius/templates/postorius/user/address_activation.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends postorius_base_template %}
-{% load i18n %}
-{% load bootstrap_tags %}
-{% load nav_helpers %}
-
-{% block subtitle %}
-{% trans 'Add email' %} | {{ user.username }}
-{% endblock %}
-
-{% block main %}
-
-    {% user_nav 'add_email' 'Add email address' %}
-
-    <form class="form-horizontal" action="{% url 'address_activation' %}" method="post">
-        {% render_form_horizontal form 2 5 'Add email address' %}
-    </form>
-
-{% endblock main %}
diff --git a/src/postorius/templates/postorius/user/address_activation_sent.html b/src/postorius/templates/postorius/user/address_activation_sent.html
deleted file mode 100644
index e446183..0000000
--- a/src/postorius/templates/postorius/user/address_activation_sent.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends postorius_base_template %}
-{% load i18n %}
-{% load nav_helpers %}
-
-{% block subtitle %}
-{% trans 'Confirmation sent' %}
-{% endblock %}
-
-{% block main %}
-
-    {% user_nav 'add_email' 'Add email address' %}
-
-    <h1>{% trans 'Email address activation sent' %}</h1>
-    <p>{% trans "A confirmation link has been sent to the email address you submitted. Please check your email account and click on the confirmation link to add this address for your account." %}</p>
-{% endblock main %}
diff --git a/src/postorius/templates/postorius/user/profile.html b/src/postorius/templates/postorius/user/profile.html
index c6e99b3..667f323 100644
--- a/src/postorius/templates/postorius/user/profile.html
+++ b/src/postorius/templates/postorius/user/profile.html
@@ -1,5 +1,6 @@
 {% extends postorius_base_template %}
 {% load i18n %}
+{% load bootstrap_tags %}
 {% load nav_helpers %}
 
 {% block subtitle %}
@@ -34,5 +35,14 @@
             </tr>
         </tbody>
     </table>
-
+    <hr />
+    <p>
+        {% blocktrans %}
+            You can add other addresses to your profile,
+            to use different addresses for your subscriptions.
+        {% endblocktrans %}
+    </p>
+    <form class="form-horizontal" action="" method="post">
+        {% render_form_horizontal form 2 5 'Add email address' %}
+    </form>
 {% endblock main %}
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index 5d2e0c1..f401039 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -83,8 +83,6 @@
     url(r'^lists/$', list_views.list_index, name='list_index'),
     url(r'^lists/new/$', list_views.list_new, name='list_new'),
     url(r'^lists/(?P<list_id>[^/]+)/', include(list_patterns)),
-    url(r'^users/address_activation/$', user_views.AddressActivationView.as_view(),
-        name='address_activation'),
     url(r'^users/address_activation/(?P<activation_key>[A-Za-z0-9]{40})/$',
         user_views.address_activation_link,
         name='address_activation_link'),
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index 0b4f0c4..c750b53 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -38,6 +38,8 @@
 from postorius.auth.decorators import *
 from postorius.views.generic import MailmanUserView
 from smtplib import SMTPException
+import errno
+from socket import error as socket_error
 
 
 class UserMailmanSettingsView(MailmanUserView):
@@ -221,32 +223,6 @@
         {'memberships': memberships})
 
 
-class AddressActivationView(TemplateView):
-    """
-    Starts the process of adding additional email addresses to a mailman user
-    record. Forms are processes and email notifications are sent accordingly.
-    """
-
-    @method_decorator(login_required)
-    def get(self, request):
-        form = AddressActivationForm(initial={'user_email': request.user.email})
-        return render(request, 'postorius/user/address_activation.html', {'form': form})
-
-    @method_decorator(login_required)
-    def post(self, request):
-        form = AddressActivationForm(request.POST)
-        if form.is_valid():
-            profile = AddressConfirmationProfile.objects.create_profile(
-                email=form.cleaned_data['email'], user=request.user)
-            try:
-                profile.send_confirmation_link(request)
-            except SMTPException:
-                messages.error(request, _('The email confirmation message could not be sent. %s')
-                               % profile.activation_key)
-            return render(request, 'postorius/user/address_activation_sent.html')
-        return render(request, 'postorius/user/address_activation.html', {'form': form})
-
-
 @login_required()
 def user_profile(request, user_email=None):
     utils.set_other_emails(request.user)
@@ -254,7 +230,25 @@
         mm_user = MailmanUser.objects.get_or_create_from_django(request.user)
     except MailmanApiError:
         return utils.render_api_error(request)
-    return render(request, 'postorius/user/profile.html', {'mm_user': mm_user})
+    if request.method == 'POST':
+        form = AddressActivationForm(request.POST)
+        if form.is_valid():
+            profile = AddressConfirmationProfile.objects.create_profile(
+                email=form.cleaned_data['email'], user=request.user)
+            try:
+                profile.send_confirmation_link(request)
+                messages.success(request, 
+                        _('Please follow the instructions sent via email to confirm the address'))
+            except (SMTPException, socket_error) as serr:
+                if not isinstance(serr, SMTPException) and serr.errno != errno.ECONNREFUSED:
+                    raise serr
+                profile.delete()
+                messages.error(request, 
+                        _('Currently emails can not be added, please try again later'))
+    else:
+        form = AddressActivationForm(initial={'user_email': request.user.email})
+    return render(request, 'postorius/user/profile.html',
+                  {'mm_user': mm_user, 'form': form}, context_instance=RequestContext(request))
 
 
 def _add_address(request, user_email, address):