diff --git a/Vagrantfile b/Vagrantfile
index 5154eb6eb8..25c71c028c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -63,7 +63,7 @@ Vagrant.configure("2") do |config|
         v.customize [
             "modifyvm", :id,
             "--name", $hostname,
-            "--memory", 2048,
+            "--memory", 4096,
             "--cpus", 2,
         ]
     end
diff --git a/www/scripts/apps/admin/require.config.js b/www/scripts/apps/admin/require.config.js
index 55a7313403..b5e71eff4b 100644
--- a/www/scripts/apps/admin/require.config.js
+++ b/www/scripts/apps/admin/require.config.js
@@ -16,7 +16,6 @@ require.config({
         "jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
         underscore: "../assets/vendors/underscore/underscore.min",
         backbone: "../assets/vendors/backbone/backbone.min",
-        zxcvbn: "../assets/vendors/zxcvbn/zxcvbn.min",
         "jquery.ui.widget": "../assets/vendors/jquery-file-upload/jquery.ui.widget.min",
         "jquery.cookie": "../assets/vendors/jquery.cookie/jquery.cookie.min",
         "jquery.treeview": "../assets/vendors/jquery-treeview/jquery.treeview",
diff --git a/www/scripts/apps/login/home/config.js b/www/scripts/apps/login/home/config.js
index 0a5b12b74d..7cc1dcd12f 100644
--- a/www/scripts/apps/login/home/config.js
+++ b/www/scripts/apps/login/home/config.js
@@ -14,6 +14,7 @@ require.config({
         jquery: "../assets/vendors/jquery/jquery.min",
         "jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
         underscore: "../assets/vendors/underscore/underscore.min",
+        "zxcvbn": "../assets/vendors/zxcvbn/zxcvbn.min",
         backbone: "../assets/vendors/backbone/backbone.min",
         i18n: "../assets/vendors/i18next/i18next.min",
         bootstrap: "../assets/vendors/bootstrap/js/bootstrap.min",
@@ -29,6 +30,9 @@ require.config({
             deps: ["jquery", "jquery.ui"],
             exports: "$.fn.geocompleter"
         },
+        "zxcvbn": {
+            deps: ["jquery"]
+        },
         "common/geonames": {
             deps: ["jquery.geonames"]
         },
diff --git a/www/scripts/apps/login/home/register.js b/www/scripts/apps/login/home/register.js
index 7fa22ded3c..8425f5ba89 100644
--- a/www/scripts/apps/login/home/register.js
+++ b/www/scripts/apps/login/home/register.js
@@ -14,7 +14,7 @@ require([
     "apps/login/home/common",
     "common/forms/views/formType/passwordSetter",
     "common/geonames",
-    "common/forms/views/formType/zxcvbn"
+    "zxcvbn"
 ], function ($, i18n, Common, RegisterForm, geonames, zxcvbn) {
     var fieldsConfiguration = [];
 
diff --git a/www/scripts/common/forms/views/formType/passwordSetter.js b/www/scripts/common/forms/views/formType/passwordSetter.js
index 75e5930689..274652de24 100644
--- a/www/scripts/common/forms/views/formType/passwordSetter.js
+++ b/www/scripts/common/forms/views/formType/passwordSetter.js
@@ -14,7 +14,7 @@ define([
     "backbone",
     "bootstrap",
     "common/forms/views/form",
-    "common/forms/views/formType/zxcvbn"
+    "zxcvbn"
 ], function ($, _, i18n, Backbone, bootstrap, FormView, zxcvbn) {
     var PasswordSetterForm = FormView.extend({
         events: function () {