diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
index 688bf45a99..0fa452a8d6 100644
--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -6,7 +6,7 @@ angular.module("admin.enterprises")
     # htmlVariable is used by textAngular wysiwyg for the long descrtiption.
     $scope.htmlVariable = longDescription
     # Provide a callback for a warning message displayed when leaving the page.
-    $scope.navigationCallback = ->
+    $scope.enterpriseNavCallback = ->
       "You are editing an enterprise!"
 
     for payment_method in $scope.PaymentMethods
diff --git a/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee b/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee
index 7eae3d69cd..6f5128d7bf 100644
--- a/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee
@@ -1,6 +1,9 @@
-angular.module("admin.utils").directive "navigationCheck", (NavigationCheck)->
-  link: ($scope) ->
+angular.module("admin.utils").directive "navCheck", (NavigationCheck)->
+  restrict: 'A'
+  scope:
+    navCallback: '&'
+  link: (scope,element,attributes) ->
     # Define navigationCallback on a controller in $scope, otherwise this default will be used:
-    $scope.navigationCallback ||= ->
+    scope.navCallback ||= ->
       "You will lose any unsaved work!"
-    NavigationCheck.register($scope.navigationCallback)
+    NavigationCheck.register(scope.navCallback)
diff --git a/app/views/admin/enterprises/_ng_form.html.haml b/app/views/admin/enterprises/_ng_form.html.haml
index 74b4347f16..e3ebe95877 100644
--- a/app/views/admin/enterprises/_ng_form.html.haml
+++ b/app/views/admin/enterprises/_ng_form.html.haml
@@ -3,7 +3,7 @@
 = admin_inject_payment_methods
 = admin_inject_shipping_methods
 
-.sixteen.columns.alpha{ ng: { app: 'admin.enterprises', controller: 'enterpriseCtrl' }, "navigation-check" => "" }
+.sixteen.columns.alpha{ ng: { app: 'admin.enterprises', controller: 'enterpriseCtrl' }, nav: { check: '',  callback: 'enterpriseNavCallback()' }}
   .eleven.columns.alpha
     = render 'form', f: f
   .one.column  
diff --git a/app/views/admin/order_cycles/index.html.haml b/app/views/admin/order_cycles/index.html.haml
index 1fac06f507..f9f832d83d 100644
--- a/app/views/admin/order_cycles/index.html.haml
+++ b/app/views/admin/order_cycles/index.html.haml
@@ -5,8 +5,6 @@
   %li#new_order_cycle_link
     = button_link_to "New Order Cycle", main_app.new_admin_order_cycle_path, :icon => 'icon-plus', :id => 'admin_new_order_cycle_link'
 
-
-
 = form_for @order_cycle_set, :url => main_app.bulk_update_admin_order_cycles_path do |f|
   %table.index#listing_order_cycles
     %colgroup