diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cb47a63a1..d8b03b2cb 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -48,13 +48,20 @@ function neutron_lbaas_configure_common {
         iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES
     fi
 
-    # Ensure config is set up properly for authentication
+    # Ensure config is set up properly for authentication neutron-lbaas
     iniset $NEUTRON_LBAAS_CONF service_auth auth_uri $AUTH_URI
     iniset $NEUTRON_LBAAS_CONF service_auth admin_tenant_name $ADMIN_TENANT_NAME
     iniset $NEUTRON_LBAAS_CONF service_auth admin_user $ADMIN_USER
     iniset $NEUTRON_LBAAS_CONF service_auth admin_password $ADMIN_PASSWORD
     iniset $NEUTRON_LBAAS_CONF service_auth auth_version $AUTH_VERSION
 
+    # Ensure config is set up properly for authentication neutron
+    iniset $NEUTRON_CONF service_auth auth_uri $AUTH_URI
+    iniset $NEUTRON_CONF service_auth admin_tenant_name $ADMIN_TENANT_NAME
+    iniset $NEUTRON_CONF service_auth admin_user $ADMIN_USER
+    iniset $NEUTRON_CONF service_auth admin_password $ADMIN_PASSWORD
+    iniset $NEUTRON_CONF service_auth auth_version $AUTH_VERSION
+
     _neutron_deploy_rootwrap_filters $NEUTRON_LBAAS_DIR
 
     $NEUTRON_BIN_DIR/neutron-db-manage --service lbaas --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE upgrade head
diff --git a/devstack/settings b/devstack/settings
index 150d07ff8..c77f74204 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,7 +16,7 @@ AUTH_URI=${AUTH_URI:-"http://127.0.0.1:5000/v2.0"}
 ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
 ADMIN_USER=${ADMIN_USER:-"admin"}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-"password"}
-AUTH_VERSION=${AUTH_VERSION:-"v2"}
+AUTH_VERSION=${AUTH_VERSION:-"2"}
 
 LBAAS_AGENT_CONF_PATH=/etc/neutron/services/loadbalancer/haproxy
 LBAAS_AGENT_CONF_FILENAME=$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini