diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb
index 2c8e3b7e..31763b02 100644
--- a/app/controllers/settings/dining_charges_controller.rb
+++ b/app/controllers/settings/dining_charges_controller.rb
@@ -16,6 +16,9 @@ class Settings::DiningChargesController < ApplicationController
   # GET /dining_charges/new
   def new
     @dining_charge = DiningCharge.new
+    @dining_charge.minimum_free_time="00:30"
+    @dining_charge.charge_block="02:00"
+    @dining_charge.time_rounding_block="00:15"
   end
 
   # GET /dining_charges/1/edit
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb
index 47801ef6..2349025a 100644
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -2,10 +2,10 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :item_code %>
+    <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
     <%= f.input :unit_price %>
     <%= f.input :taxable %>
-    <%= f.input :charge_type %>
+    <%= f.input :charge_type, :collection => [:hr, :day] %>
     <%= f.input :minimum_free_time %>
     <%= f.input :charge_block %>
     <%= f.input :time_rounding %>
@@ -16,3 +16,4 @@
     <%= f.button :submit %>
   </div>
 <% end %>
+
diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb
index 1caba288..2aa13a4b 100644
--- a/app/views/settings/dining_charges/new.html.erb
+++ b/app/views/settings/dining_charges/new.html.erb
@@ -16,3 +16,17 @@
 		</div>
     <%= render 'form', dining_charge: @dining_charge %>
 </div>
+<script>
+function randomNumber(len) {
+    var randomNumber;
+    var n = '';
+
+    for(var count = 0; count < len; count++) {
+        randomNumber = Math.floor(Math.random() * 10);
+        n += randomNumber.toString();
+    }
+    return n;
+}
+
+document.getElementById("item_code").value = "<%= @zone.id %>"+"<%= @settings_dining_facility.id %>"+"_"+randomNumber(5);
+</script>
\ No newline at end of file