diff --git a/changelog.md b/changelog.md
index ed9126e..ce62518 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
-## version 0.8.1
+## version 0.8.1 -> 0.8.2
  - App store image size issue
+ - Add installer hostname prefix/suffix
+ - Fix issue with inconsistent password when installing from the market
 
 ## Version 0.8.0
  - Custmizable homepage / theme colors
diff --git a/client/src/pages/servapps/containers/docker-compose.jsx b/client/src/pages/servapps/containers/docker-compose.jsx
index ab5b3c3..c028624 100644
--- a/client/src/pages/servapps/containers/docker-compose.jsx
+++ b/client/src/pages/servapps/containers/docker-compose.jsx
@@ -94,6 +94,22 @@ const DockerComposeImport = ({ refresh, dockerComposeInit, installerInit, defaul
   const [context, setContext] = useState({});
   const [installer, setInstaller] = useState(installerInit);
   const [config, setConfig] = useState({});
+  const [passwords, setPasswords] = useState([
+    randomString(24),
+    randomString(24),
+    randomString(24),
+    randomString(24)
+  ]);
+
+  const resetPassword = () => {
+    setPasswords([
+      randomString(24),
+      randomString(24),
+      randomString(24),
+      randomString(24)
+    ]);
+  }
+
 
   function refreshConfig() {
     API.config.get().then((res) => {
@@ -335,12 +351,7 @@ const DockerComposeImport = ({ refresh, dockerComposeInit, installerInit, defaul
           ServiceName: serviceName,
           Hostnames: hostnames,
           Context: context,
-          Passwords: [
-            randomString(24),
-            randomString(24),
-            randomString(24),
-            randomString(24)
-          ],
+          Passwords: passwords,
           CPU_ARCH: API.CPU_ARCH,
           CPU_AVX: API.CPU_AVX,
           DefaultDataPath: (config && config.DockerConfig && config.DockerConfig.DefaultDataPath) || "/usr",
@@ -358,7 +369,7 @@ const DockerComposeImport = ({ refresh, dockerComposeInit, installerInit, defaul
                 if (route.useHost) {
                   let newRoute = Object.assign({}, route);
                   if (route.useHost === true) {
-                    newRoute.host = getHostnameFromName(key + (routeId > 0 ? '-' + routeId : ''))
+                    newRoute.host = (newRoute.hostPrefix || '') + getHostnameFromName(key + (routeId > 0 ? '-' + routeId : '')) + (newRoute.hostSuffix || '');
                   }
                   
                   if(!newHostnames[key]) newHostnames[key] = {};
@@ -467,6 +478,7 @@ const DockerComposeImport = ({ refresh, dockerComposeInit, installerInit, defaul
     setDockerCompose('');
     setInstaller(installerInit);
     setServiceName(cleanDefaultName || 'default-name');
+    resetPassword();
   }
 
   return <>
diff --git a/package.json b/package.json
index 23c4925..bb6b3dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "",
   "main": "test-server.js",
   "bugs": {