diff --git a/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee b/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee
index 64940d15e2..0b29180b57 100644
--- a/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee
@@ -10,7 +10,7 @@ Darkswarm.directive "ofnEmptiesCart", (CurrentHub, CurrentOrder, Navigation, sto
       elm.bind 'click', (ev)->
         ev.preventDefault()
         if confirm "Are you sure? This will change your selected Hub and remove any items in you shopping cart."
-          storage.clearAll()
+          storage.clearAll() # One day this will have to be moar GRANULAR
           Navigation.go scope.hub.path 
     else
       scope.action = attr.shop
diff --git a/app/views/spree/checkout/payment/_gateway.html.haml b/app/views/spree/checkout/payment/_gateway.html.haml
index 79e6725427..66b189f39b 100644
--- a/app/views/spree/checkout/payment/_gateway.html.haml
+++ b/app/views/spree/checkout/payment/_gateway.html.haml
@@ -1,4 +1,14 @@
 .row
+  .small-6.columns
+    %label
+      First Name
+    %input{type: :text, disabled: true, "ng-value" => "order.bill_address.firstname"}
+
+  .small-6.columns
+    %label
+      Last Name
+    %input{type: :text, disabled: true, "ng-value" => "order.bill_address.lastname"}
+
   .small-6.columns
     = validated_input "Card Number", "secrets.card_number", required: true, maxlength: 19, autocomplete: "off"
   .small-6.columns
@@ -13,4 +23,3 @@
     %select{"ng-model" => "secrets.card_month", "ng-options" => "number as name for (number, name) in months", name: "secrets.card_month", required: true}
   .small-6.columns
     %select{"ng-model" => "secrets.card_year", "ng-options" => "year for year in years", name: "secrets.card_year", required: true}
-