diff --git a/account/templates/base.html b/account/templates/base.html
index e7b72e1..158baa7 100644
--- a/account/templates/base.html
+++ b/account/templates/base.html
@@ -118,16 +118,36 @@
             <div class="span4">
                 <div class="well">
                 <h4>Login</h4>
-                <form class="form" action="/account/login/?next={% url account.views.home %}"
-                      method="post">
-                    {% csrf_token %}
-                    {{ form|crispy }}
-                    <div class="control-group">
-                        <div class="controls">
-                            <button type="submit" class="btn btn-primary">{% trans "Sign in" %}</button>
+                    <form class="form" action="/account/login/?next={% url account.views.home %}"
+                          method="post">
+                        {% csrf_token %}
+                        {{ login_form|crispy }}
+                        <div class="control-group">
+                            <div class="controls">
+                                <button type="submit" class="btn btn-primary">{% trans "Sign in" %}</button>
+                            </div>
                         </div>
-                    </div>
-                </form>
+                    </form>
+                    <hr />
+                    <form class="form" action="/" method="get">
+                        <input type="text" id="check_nickname" name="check_nickname">
+                        <div class="control-group">
+                            <div class="controls">
+                                <button type="submit" class="btn">{% trans "Check nick" %}</button>
+                            </div>
+                        </div>
+                    </form>
+                    {% if not check_nickname == "" %}
+                        {% if check_nickname %}
+                            <div class="alert alert-danger alert-block">
+                                {% blocktrans %}This nick is already taken.{% endblocktrans %}
+                            </div>
+                        {% else %}
+                            <div class="alert alert-success alert-block">
+                                {% blocktrans %}This nick is still available.{% endblocktrans %}
+                            </div>
+                        {% endif %}
+                    {% endif %}
                 </div><!-- /.well -->
             </div>
         </div>
diff --git a/account/views.py b/account/views.py
index 927aab1..4dbc420 100644
--- a/account/views.py
+++ b/account/views.py
@@ -6,7 +6,7 @@ import hashlib
 import smbpasswd
 
 from django.conf import settings
-from django.http import HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
 from django.contrib.auth import login, logout, authenticate
@@ -25,14 +25,28 @@ from password_encryption import *
 def landingpage(request):
     if request.user.is_authenticated():
         return HttpResponseRedirect('/account')
-    form = LoginForm()
-    groups = Group.objects.all()
+    login_form = LoginForm()
     try:
+        # just in case the group hasn't yet been synced
         admins = Group.objects.get(name="ldap_admins").user_set.all()
     except:
+        # else provide an emtpy list
         admins = []
 
-    return render(request, 'base.html', {'form': form, 'admins': admins})
+    # https://github.com/c-base/cbmi/issues/20
+    # check if nick is still available feature
+    check_nickname = request.GET.get('check_nickname', '')
+    if check_nickname:
+        try:
+            user = User.objects.get(username=check_nickname)
+            check_nickname = True
+            # output as text if requested
+            if request.GET.get('raw', ''):
+                return HttpResponse(check_nickname)
+        except:
+            check_nickname = False
+
+    return render(request, 'base.html', locals())
 
 def auth_login(request):
     redirect_to = request.GET.get('next', '') or '/'