diff --git a/tools/setup/postgresql-init-dev-db b/tools/setup/postgresql-init-dev-db
index a27ec3a4a5..d9be0bdcd0 100755
--- a/tools/setup/postgresql-init-dev-db
+++ b/tools/setup/postgresql-init-dev-db
@@ -75,12 +75,12 @@ ALTER USER $USERNAME CREATEDB;
 ALTER ROLE $USERNAME SET search_path TO $SEARCH_PATH;
 
 DO \$\$BEGIN
-    CREATE USER $VAGRANTUSERNAME;
+    CREATE USER "$VAGRANTUSERNAME"; 
 EXCEPTION WHEN duplicate_object THEN
     RAISE NOTICE '$VAGRANTUSERNAME user already exists';
 END\$\$;
-GRANT $USERNAME TO $VAGRANTUSERNAME;
-ALTER ROLE $VAGRANTUSERNAME SET search_path TO $SEARCH_PATH;
+GRANT $USERNAME TO "$VAGRANTUSERNAME";
+ALTER ROLE "$VAGRANTUSERNAME" SET search_path TO $SEARCH_PATH;
 EOF
 
 umask go-rw