diff --git a/livesupport/bin/setupDevelopmentEnvironment.sh b/livesupport/bin/setupDevelopmentEnvironment.sh
index 5db680d04..e8c9cc685 100755
--- a/livesupport/bin/setupDevelopmentEnvironment.sh
+++ b/livesupport/bin/setupDevelopmentEnvironment.sh
@@ -98,6 +98,13 @@ $basedir/configure --prefix=$usrdir --with-www-docroot=$usrdir/var
 make all
 
 
+#-------------------------------------------------------------------------------
+#  User setup
+#-------------------------------------------------------------------------------
+#echo "Setting up user settings..."
+
+$bindir/user_setup.sh || exit 1
+
 #-------------------------------------------------------------------------------
 #  We're done
 #-------------------------------------------------------------------------------
diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh
index 909eac259..a6cc5c3af 100755
--- a/livesupport/bin/user_setup.sh
+++ b/livesupport/bin/user_setup.sh
@@ -326,6 +326,15 @@ rm -f $htmldir/livesupport
 ln -s $modules_dir $htmldir/livesupport
 
 
+#-------------------------------------------------------------------------------
+#  Setup storageServer
+#-------------------------------------------------------------------------------
+echo "Setting up storageServer..."
+
+make -C $modules_dir/storageServer storage || exit 1
+make -C $modules_dir/archiveServer storage || exit 1
+
+
 #-------------------------------------------------------------------------------
 #  Setup directory permissions
 #-------------------------------------------------------------------------------