diff --git a/ci/scripts/ci_gradle_properties.sh b/ci/scripts/ci_gradle_properties.sh
index d12ca7f9517b41d5e6d7a6312dc6808a86b6fcad..08bd5a6116e83cfa04ac25a6cbdda2c865504c80 100755
--- a/ci/scripts/ci_gradle_properties.sh
+++ b/ci/scripts/ci_gradle_properties.sh
@@ -25,6 +25,6 @@
 
 # create gradle properties
 echo org.gradle.jvmargs=-Xmx1536m >> gradle.properties
-echo glpi_user=$GLPI_USER >> gradle.properties
-echo glpi_password=$GLPI_PASSWORD >> gradle.properties
-echo glpi_url=$GLPI_URL >> gradle.properties
+echo glpi_user="$GLPI_USER" >> gradle.properties
+echo glpi_password="$GLPI_PASSWORD" >> gradle.properties
+echo glpi_url="$GLPI_URL" >> gradle.properties
diff --git a/glpi/build.gradle b/glpi/build.gradle
index 130151511e8c0d1e81fa880e6d577340b7457613..fdd1b972fc31de8f488950400b6006d6e4f364c5 100644
--- a/glpi/build.gradle
+++ b/glpi/build.gradle
@@ -17,10 +17,9 @@ android {
 
     buildTypes {
         buildTypes.each {
-
-            def glpi_user_val = glpi_user ?: "\"\""
-            def glpi_password_val = glpi_password ?: "\"\""
-            def glpi_url_val = glpi_url ?: "\"\""
+            def glpi_user_val = "\"${glpi_user}\"" ?: "\"\""
+            def glpi_password_val = "\"${glpi_password}\"" ?: "\"\""
+            def glpi_url_val = "\"${glpi_url}\"" ?: "\"\""
 
             it.buildConfigField 'String', 'GLPI_USER', glpi_user_val
             it.buildConfigField 'String', 'GLPI_PASSWORD', glpi_password_val