diff --git a/app/views/install/_form.html.erb b/app/views/install/_form.html.erb
index c4520cd6..682143c8 100755
--- a/app/views/install/_form.html.erb
+++ b/app/views/install/_form.html.erb
@@ -1,4 +1,4 @@
-<form action="/activate" method="POST" class="row">
+<%= form_tag activate_path, class: "row" do %>
   <div class="col-md-6">
     <div class="form-group">
       <label for="exampleInputEmail1">Business Name</label>
@@ -27,11 +27,11 @@
     </div>
     <div class="form-group">
       <label for="lblDBName">Database Schema</label>
-      <input type="text" class="form-control" name="db_schema" aria-describedby="db_schema" placeholder="Database Schema">      
+      <input type="text" class="form-control" name="db_schema" aria-describedby="db_schema" placeholder="Database Schema">
     </div>
     <div class="form-group">
       <label for="lblAdministrator">Database Username</label>
-      <input type="text" class="form-control" name="db_user" aria-describedby="db_user" placeholder="Database Username">      
+      <input type="text" class="form-control" name="db_user" aria-describedby="db_user" placeholder="Database Username">
     </div>
     <div class="form-group">
       <label for="admin_password">Database Password</label>
@@ -41,4 +41,4 @@
   <div class="col-md-12 text-center">
     <button type="submit" class="btn btn-primary">Activate</button>
   </div>
-</form>
+<% end %>
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 1dbb3b98..4ca2f1ad 100644
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -51,8 +51,18 @@
 			<% end %>
 			<% if can? :index, :home %>
 				<% if current_login_employee.role != "kitchen" %>
+				<% if current_user.role == "cashier"
+					shift = ShiftSale.current_open_shift(current_user.id)
+		      if !shift.nil?
+		        path = origami_dashboard_path
+		      else
+		        path = new_origami_shift_path
+		      end
+				else current_user.role == "administrator"
+					path = origami_dashboard_path
+				end %>
 				<li class="menu-up">
-					<a href="<%= origami_dashboard_path %>">
+					<a href="<%= path %>">
 						<i class="material-icons">monetization_on</i>
 						<span><%= t :origami %></span>
 					</a>