diff --git a/README.md b/README.md
index 5207406..487f2c1 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,6 @@
 * Inside auth and models
 * local users tied to inside user
 * maybe user add page
-* menu with login and logout
 
 ### Backend
 * store in inside-table din_phonenumber, din_usedmembercard, din_user
diff --git a/apps/kassa/templates/header.html b/apps/kassa/templates/header.html
index 14a53d4..a7965aa 100644
--- a/apps/kassa/templates/header.html
+++ b/apps/kassa/templates/header.html
@@ -15,7 +15,10 @@
         <li class="active"><a href="{% url "register" %}">{% trans "Home" %}</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        {% if user.is_authenticated %}<li><a href="{% url "logout" %}">{% trans "Log out" %}</a></li>{% endif %}
+        {% if user.is_authenticated %}
+            <li><a href="#">Logged in as: <strong>{{ user.get_full_name|default:user.username }}</strong></a></li>
+            <li><a href="{% url "logout" %}">{% trans "Log out" %}</a></li>
+        {% endif %}
       </ul>
     </div><!--/.nav-collapse -->
   </div>
diff --git a/apps/kassa/templates/kassa/register.html b/apps/kassa/templates/kassa/register.html
index ffbf608..eeb2357 100644
--- a/apps/kassa/templates/kassa/register.html
+++ b/apps/kassa/templates/kassa/register.html
@@ -13,7 +13,7 @@
             <span class="glyphicon glyphicon-phone"></span>
             {{ add_card_form|bootstrap }}
             <p><em>Registering a card number with a phone number already tied to an existing user, will add the card to that user.</em></p>
-            <button type="submit" class="btn btn-primary btn-lg">{% trans "Register" %}</button>
+            <button id="register-submit-btn" type="submit" class="btn btn-primary btn-lg">{% trans "Register" %}</button>
         </form>
     </div>
     <div class="col-sm-6">
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 404c2cc..1739174 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -1,13 +1,32 @@
+var _dom;
 function format_results(results) {
     return nunjucks.render('search_results.html', {'results':results});
 }
+function validate_form() {
+    var errors = [];
+    /* TODO
+       - cardnumber should start with 1 and be 9 digits long
+       - cardnumber should not be empty
+       - cardnumber should be in the database
+       - phonenumber should be valid (python-phonenumbers)
+       - userid exists (optional)
+    */
+
+    if(errors.length === 0) {
+        _dom.registerButton.removeAttr('disabled');
+        return true;
+    } else {
+        _dom.registerButton.attr('disabled','disabled');
+    }
+}
 
 $(document).ready(function(){
-    var _dom = {
+    _dom = {
         results: $('.results-wrap'),
         query: $('#id_query'),
         phoneNumber: $('#id_phone_number'),
-        cardNumber: $('#id_card_number')
+        cardNumber: $('#id_card_number'),
+        registerButton: $('#register-submit-btn')
     };
     var urls = {
         insideUserApi: '/inside/user/'
@@ -17,16 +36,20 @@ $(document).ready(function(){
     _dom.query.on('keyup', function() {
         var val = _dom.query.val();
         $.getJSON(urls.insideUserApi, {q: val}, function(data) {
-            //console.log(data);
+            console.log(data);
             if(data.results && data.results.length > 0) {
                 _dom.results.html(format_results(data.results));
             } else {
-                _dom.results.html('No existing user with that phone number');
+                if(val === "") {
+                    _dom.results.html('');
+                } else {
+                    _dom.results.html('No existing user with that phone number');
+                }
             }
         });
     });
 
-    /* Click search result */
+    /* On search result click */
     _dom.results.on('click', '.search-result input', function(e){
         var label = $(this).parent();
         var number = label.attr('data-phone-number');
@@ -34,4 +57,7 @@ $(document).ready(function(){
         label.toggleClass('selected');
         _dom.phoneNumber.val(number);
     });
+
+    /* Default state disabled */
+    _dom.registerButton.attr('disabled','disabled');
 });
\ No newline at end of file
diff --git a/static/app/templates/search_result.html b/static/app/templates/search_result.html
index 2cd5100..ba9762f 100644
--- a/static/app/templates/search_result.html
+++ b/static/app/templates/search_result.html
@@ -1,4 +1,4 @@
-{% if not res.cardno or res.legacy_card_number %}
+{% if not res.cardno or res.card_is_legacy %}
     <label for="{{ res.id }}" data-phone-number="{{ res.number }}" class="list-group-item search-result can-register-card{% if res.is_member == "1" %} member{% else %} not-member{% endif %}">
     <input type="radio" name="user" id="{{ res.id }}">
 {% else %}
@@ -8,13 +8,13 @@
 {{ res.firstname }} {{ res.lastname }}
 <!-- Label -->
 {% if res.is_member == "1" %}
-    <span class="label label-success">Member</span>
+    <span class="label label-success">Member: {{res.expires|default('Lifelong')}}</span>
 {% elif res.expires == "0000-00-00" %}
     <span class="label label-default">Registered</span>
 {% else %}
-    <span class="label label-warning">Expired: {{res.expires}}</span>
+    <span class="label label-warning">Expired: {{ res.expires }}</span>
 {% endif %}
-{% if not res.cardno or res.legacy_card_number %}
+{% if not res.cardno or res.card_is_legacy %}
     </label>
 {% else %}
     </div>
diff --git a/static/dist/scripts/app.js b/static/dist/scripts/app.js
index 404c2cc..1739174 100644
--- a/static/dist/scripts/app.js
+++ b/static/dist/scripts/app.js
@@ -1,13 +1,32 @@
+var _dom;
 function format_results(results) {
     return nunjucks.render('search_results.html', {'results':results});
 }
+function validate_form() {
+    var errors = [];
+    /* TODO
+       - cardnumber should start with 1 and be 9 digits long
+       - cardnumber should not be empty
+       - cardnumber should be in the database
+       - phonenumber should be valid (python-phonenumbers)
+       - userid exists (optional)
+    */
+
+    if(errors.length === 0) {
+        _dom.registerButton.removeAttr('disabled');
+        return true;
+    } else {
+        _dom.registerButton.attr('disabled','disabled');
+    }
+}
 
 $(document).ready(function(){
-    var _dom = {
+    _dom = {
         results: $('.results-wrap'),
         query: $('#id_query'),
         phoneNumber: $('#id_phone_number'),
-        cardNumber: $('#id_card_number')
+        cardNumber: $('#id_card_number'),
+        registerButton: $('#register-submit-btn')
     };
     var urls = {
         insideUserApi: '/inside/user/'
@@ -17,16 +36,20 @@ $(document).ready(function(){
     _dom.query.on('keyup', function() {
         var val = _dom.query.val();
         $.getJSON(urls.insideUserApi, {q: val}, function(data) {
-            //console.log(data);
+            console.log(data);
             if(data.results && data.results.length > 0) {
                 _dom.results.html(format_results(data.results));
             } else {
-                _dom.results.html('No existing user with that phone number');
+                if(val === "") {
+                    _dom.results.html('');
+                } else {
+                    _dom.results.html('No existing user with that phone number');
+                }
             }
         });
     });
 
-    /* Click search result */
+    /* On search result click */
     _dom.results.on('click', '.search-result input', function(e){
         var label = $(this).parent();
         var number = label.attr('data-phone-number');
@@ -34,4 +57,7 @@ $(document).ready(function(){
         label.toggleClass('selected');
         _dom.phoneNumber.val(number);
     });
+
+    /* Default state disabled */
+    _dom.registerButton.attr('disabled','disabled');
 });
\ No newline at end of file
diff --git a/static/dist/scripts/templates.js b/static/dist/scripts/templates.js
index 050b26c..0d98c6f 100644
--- a/static/dist/scripts/templates.js
+++ b/static/dist/scripts/templates.js
@@ -3,7 +3,7 @@ var lineno = null;
 var colno = null;
 var output = "";
 try {
-if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"legacy_card_number", env.opts.autoescape)) {
+if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"card_is_legacy", env.opts.autoescape)) {
 output += "\n    <label for=\"";
 output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"id", env.opts.autoescape), env.opts.autoescape);
 output += "\" data-phone-number=\"";
@@ -41,7 +41,9 @@ output += " ";
 output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"lastname", env.opts.autoescape), env.opts.autoescape);
 output += "\n<!-- Label -->\n";
 if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape) == "1") {
-output += "\n    <span class=\"label label-success\">Member</span>\n";
+output += "\n    <span class=\"label label-success\">Member: ";
+output += runtime.suppressValue(env.getFilter("default").call(context, runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"expires", env.opts.autoescape),"Lifelong"), env.opts.autoescape);
+output += "</span>\n";
 ;
 }
 else {
@@ -58,7 +60,7 @@ output += "</span>\n";
 ;
 }
 output += "\n";
-if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"legacy_card_number", env.opts.autoescape)) {
+if(!runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"cardno", env.opts.autoescape) || runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"card_is_legacy", env.opts.autoescape)) {
 output += "\n    </label>\n";
 ;
 }