diff --git a/colab/accounts/templates/accounts/user_update_form.html b/colab/accounts/templates/accounts/user_update_form.html
index 88d8711..23be09a 100644
--- a/colab/accounts/templates/accounts/user_update_form.html
+++ b/colab/accounts/templates/accounts/user_update_form.html
@@ -1,5 +1,10 @@
 {% extends "base.html" %}
-{% load i18n gravatar plugins %}
+{% load i18n gravatar plugins widgets_tag %}
+
+{% block html %}
+   {% import_widgets 'profile' %}
+   {{ block.super }}
+{% endblock %}
 
 {% block head_js %}
 <script>
@@ -105,7 +110,7 @@ $(function() {
 {% block head %}
   {{ block.super }}
 
-  {% for widget in widgets %}
+  {% for widget in widgets_profile %}
     {{ widget.get_header }}
   {% endfor %}
 
@@ -129,7 +134,7 @@ $(function() {
   <!-- Start of navs -->
   <ul class="nav nav-tabs">
     <li class="active"><a data-toggle="pill" href="#profile">Profile</a></li>
-    {% for widget in widgets %}
+    {% for widget in widgets_profile %}
       <li>
         <a data-toggle="pill" href="#{{ widget.identifier }}">{{ widget.name }}</a>
       </li>
@@ -229,7 +234,7 @@ $(function() {
         </div>
       </form>
     </div>
-    {% for widget in widgets %}
+    {% for widget in widgets_profile %}
       <div id="{{ widget.identifier }}" class="tab-pane fade">
         <h2>{{ widget.name }}</h2>
         {{ widget.get_body }}
diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index d362420..5b206e8 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -15,7 +15,6 @@ from colab.super_archives.models import (EmailAddress,
                                          EmailAddressValidation)
 from colab.search.utils import get_collaboration_data, get_visible_threads
 from colab.accounts.models import User
-from colab.widgets.widget_manager import WidgetManager
 
 from .forms import (UserCreationForm, ListsForm, UserUpdateForm)
 from .utils import mailman
@@ -43,12 +42,6 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
 
         return obj
 
-    def get_context_data(self, **kwargs):
-        context = {}
-        context['widgets'] = WidgetManager.get_widgets('profile', self.request)
-        context.update(kwargs)
-        return super(UserProfileUpdateView, self).get_context_data(**context)
-
 
 class UserProfileDetailView(UserProfileBaseMixin, DetailView):
     template_name = 'accounts/user_detail.html'
diff --git a/colab/accounts/widgets/__init__.py b/colab/accounts/widgets/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/colab/accounts/widgets/__init__.py
diff --git a/colab/settings.py b/colab/settings.py
index 89a6bfc..6993810 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -53,6 +53,7 @@ INSTALLED_APPS = (
     'colab',
     'colab.home',
     'colab.plugins',
+    'colab.widgets',
     'colab.super_archives',
     'colab.rss',
     'colab.search',
diff --git a/colab/templates/base.html b/colab/templates/base.html
index 60e15e7..677940c 100644
--- a/colab/templates/base.html
+++ b/colab/templates/base.html
@@ -2,6 +2,7 @@
 {% load i18n gravatar plugins %}
 {% load static from staticfiles %}
 
+{% block html %}
 <html>
   <head>
   {% block head %}
@@ -101,3 +102,4 @@
   {% block footer_js %}{% endblock %}
   </body>
 </html>
+{% endblock %}
diff --git a/colab/widgets/templatetags/__init__.py b/colab/widgets/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/colab/widgets/templatetags/__init__.py
diff --git a/colab/widgets/templatetags/widgets_tag.py b/colab/widgets/templatetags/widgets_tag.py
new file mode 100644
index 0000000..44dfdfe
--- /dev/null
+++ b/colab/widgets/templatetags/widgets_tag.py
@@ -0,0 +1,14 @@
+from django import template
+from colab.widgets.widget_manager import WidgetManager
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def import_widgets(context, area_id, widget_var=None):
+    if not widget_var:
+        widget_var = "widgets_{}".format(area_id)
+    context[widget_var] = WidgetManager.get_widgets(area_id,
+                                                    context['request'])
+    return ""
--
libgit2 0.21.2