diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 3113a6ef..d3c8c548 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -207,7 +207,7 @@ $(document).ready(function() {
     function storeAccountData(data) {
         account_data = $.extend({}, account_data_default, data);
         account_data['balance'] = parseFloat(account_data['balance']);
-        $('#id_on_acc').val(account_data['pk']);
+        $('#id_on_acc').val(account_data['id']);
         displayAccountData();
     }
 
@@ -1038,7 +1038,7 @@ $(document).ready(function() {
 
     // Shorcuts
 
-    $(document).on('keypress', function(e) {
+    $(document).on('keydown', function(e) {
         switch (e.keyCode) {
             case 112:
                 // F1 - Cool reset