diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index a05eb81a612..f96a7c4735b 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -17,6 +17,7 @@
 
 
 #new labels (begin) **********************************************************************************************
+message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
 label.local.storage.enabled=Local storage enabled
 label.tier.details=Tier details
 label.edit.tags=Edit tags
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index b3e6970d78a..fffd4617ac6 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -7,6 +7,7 @@
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'message.zoneWizard.enable.local.storage': '<fmt:message key="message.zoneWizard.enable.local.storage"/>',
 'label.edit.tags': '<fmt:message key="label.edit.tags"/>',  
 'label.local.storage.enabled': '<fmt:message key="label.local.storage.enabled"/>',
 'label.tier.details': '<fmt:message key="label.tier.details"/>',
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 8877497e270..8414048ab74 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -497,7 +497,26 @@
           },
           localstorageenabled: {
             label: 'label.local.storage.enabled',
-            isBoolean: true
+            isBoolean: true,
+            onChange: function(args) {
+              var $checkbox = args.$checkbox;
+
+              if ($checkbox.is(':checked')) {
+                cloudStack.dialog.confirm({
+                  message: 'message.zoneWizard.enable.local.storage',
+                  action: function() {
+                    $checkbox.attr('checked', true);
+                  },
+                  cancelAction: function() {
+                    $checkbox.attr('checked', false);
+                  }
+                });
+
+                return false;
+              }
+
+              return true;
+            }
           }
         }
       },