diff --git a/update_credentials.sh b/update_credentials.sh
index 599ae9f..46f8695 100644
--- a/update_credentials.sh
+++ b/update_credentials.sh
@@ -10,27 +10,27 @@ if [ ${DEBUG} ]; then
 fi;
 
 # copy over default security folder to data dir (if not existing)
-if [ ! -d "${GEOSERVER_DATA_DIR}security" ]; then
-  cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security" ${GEOSERVER_DATA_DIR}
+if [ ! -d "${GEOSERVER_DATA_DIR}/security" ]; then
+  cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security" ${GEOSERVER_DATA_DIR}/
 fi
 
 GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER:-admin}
 GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD:-geoserver}
 
 # templates to use as base for replacement
-USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security/usergroup/default/users.xml"
+USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/usergroup/default/users.xml"
 echo "USING USERS XML ORIGINAL:" $USERS_XML_ORIG
-ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security/role/default/roles.xml"
+ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/role/default/roles.xml"
 echo "USING ROLES XML ORIGINAL:" $ROLES_XML_ORIG
 
 # final users.xml file GeoServer data dir
-USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}security/usergroup/default/users.xml}
+USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}/security/usergroup/default/users.xml}
 echo "SETTING USERS XML:" $USERS_XML
 # final roles.xml file GeoServer data dir
-ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}security/role/default/roles.xml}
+ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}/security/role/default/roles.xml}
 echo "SETTING ROLES XML:" . $ROLES_XML
 
-CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX"geoserver/WEB-INF/lib/"
+CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX/geoserver/WEB-INF/lib/
 
 # tmp files
 TMP_USERS=/tmp/users.xml
@@ -68,4 +68,4 @@ else
     exit
 fi
 
-echo "... DONE updating GeoServer Credentials ..."
\ No newline at end of file
+echo "... DONE updating GeoServer Credentials ..."