diff --git a/ivatar/ivataraccount/templates/login.html b/ivatar/ivataraccount/templates/login.html
index ccbf6ac..6210eab 100644
--- a/ivatar/ivataraccount/templates/login.html
+++ b/ivatar/ivataraccount/templates/login.html
@@ -29,7 +29,11 @@
 <label for="id_password">{% trans 'Password' %}:</label>
 <input type="password" name="password" class="form-control" required id="id_password">
 </div>
-  <button type="submit" class="btn btn-default">{% trans 'Login' %}</button> or <a href="{% url 'new_account' %}" class="btn btn-default">{% trans 'Create new user' %}</a>
+  <button type="submit" class="btn btn-default">{% trans 'Login' %}</button>
+  or
+  <a href="{% url 'openid-login' %}" class="btn btn-default">{% trans 'Login with OpenID' %}</a>
+  or
+  <a href="{% url 'new_account' %}" class="btn btn-default">{% trans 'Create new user' %}</a>
 </form>
 </div>
 <div style="height:40px"></div>
diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py
index 03fd460..414bc3e 100644
--- a/ivatar/ivataraccount/views.py
+++ b/ivatar/ivataraccount/views.py
@@ -526,6 +526,14 @@ class RemoveConfirmedOpenIDView(View):
         try:
             openid = self.model.objects.get(  # pylint: disable=no-member
                 user=request.user, id=kwargs['openid_id'])
+            try:
+                openidobj = UserOpenID.objects.get(  # pylint: disable=no-member
+                    user_id=request.user.id,
+                    claimed_id=openid.openid)
+                openidobj.delete()
+            except:
+                # Why it is not there?
+                pass
             openid.delete()
             messages.success(request, _('ID removed'))
         except self.model.DoesNotExist:  # pylint: disable=no-member
diff --git a/templates/base.html b/templates/base.html
index d3a19a3..3eb96a7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -71,7 +71,15 @@
 
   {% autoescape off %}{% endautoescape %}
 
-  <div class="container">
+    <div class="container">
+      {% if messages %}
+          {% for message in messages %}
+            <div class="alert alert-{{ message.tags }}" role="alert">
+              {{ message }}
+            </div>
+          {% endfor %}
+      {% endif %}
+
       {% block content %}{% endblock content %}
     </div>
 
diff --git a/templates/openid/login.html b/templates/openid/login.html
index b074171..3bcfbd7 100644
--- a/templates/openid/login.html
+++ b/templates/openid/login.html
@@ -27,12 +27,14 @@
 <p><label for="id_openid_identifier">{% trans 'OpenID' %}:</label>&nbsp;
 <input class="required openid" id="id_openid_identifier" size="70" maxlength="255" name="openid_identifier" value="{{ openid_identifier }}" type="text"></p>
 
-<p><input type="submit" value="{% trans 'Login' %}" />
+<p>
+<button type="submit" class="btn btn-default">{% trans 'Login' %}</button>
 <input type="hidden" name="next" id="next"/>
 <script>
   document.getElementById("next").value = window.location.protocol + '//' + window.location.hostname + "{% url 'profile' %}";
 </script>
-&nbsp;<a href="{% url 'home' %}">{% trans 'Cancel' %}</a></p>
+&nbsp;
+<button type="reset" class="btn btn-default" onclick="window.history.back();">{% trans 'Cancel' %}</button>
 
 </form>