diff --git a/deploy/az/sql/readme.md b/deploy/az/sql/readme.md
index bbc0b9140..0359fb727 100644
--- a/deploy/az/sql/readme.md
+++ b/deploy/az/sql/readme.md
@@ -8,15 +8,17 @@ The ARM template `sqldeploy.json` and its parameter file (`sqldeploy.parameters.
 
 ## Editing sqldeploy.parameters.json file
 
-You have to edit the `sqldeploy.parameters.json` file to set your values. There are two parameters:
+You **must** edit the `sqldeploy.parameters.json` file to set login and password of the admin user.
 
-1. `sql_server` is a object parameter that contains the sql server name, the admin login and password, and the database names.
-2. `suffix` is a suffix that will be added to thee sql_server name to ensure uniqueness.
+1. `sql_server` is a object parameter that contains the sql server name and the database names. You can leave default values if you want.
+2. `admin` is a string with the admin logon. You MUST provide a valid value
+3. `adminpwd` is a string with the admin password. You MUST provide a valid value
+
+ARM script ensures uniqueness of the SQL server created by appending one unique string in its name (defined in the `sql_server.name` parameter).
 
 ## Deploy the template
 
 Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
-
 i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
 
 ```
@@ -31,3 +33,4 @@ create-resources.cmd sql\sqldeploy newResourceGroup -c westus
 
 
 
+
diff --git a/deploy/az/sql/sqldeploy.json b/deploy/az/sql/sqldeploy.json
index c4b9dca20..f3880e7b8 100644
--- a/deploy/az/sql/sqldeploy.json
+++ b/deploy/az/sql/sqldeploy.json
@@ -5,12 +5,17 @@
     "sql_server": {
       "type": "object"
     },
-    "suffix": {
+    "admin": {
+      "type": "string"
+    },
+    "adminpwd":  {
       "type": "string"
     }
   },
   "variables": {
-    "sql_server_name": "[concat(parameters('sql_server').name, '-', parameters('suffix'))]"
+    "sql_server_name": "[concat(parameters('sql_server').name, '-', uniqueString(resourceGroup().id))]",
+    "admin": "[parameters('admin')]",
+    "adminpwd": "[parameters('adminpwd')]"
   },
   "resources": [
     {
@@ -19,8 +24,8 @@
       "apiVersion": "2014-04-01-preview",
       "location": "[resourceGroup().location]",
       "properties": {
-        "administratorLogin": "[parameters('sql_server').admin]",
-        "administratorLoginPassword": "[parameters('sql_server').adminpwd]",
+        "administratorLogin": "[variables('admin')]",
+        "administratorLoginPassword": "[variables('adminpwd')]",
         "version": "12.0"
       },
       "resources": [
diff --git a/deploy/az/sql/sqldeploy.parameters.json b/deploy/az/sql/sqldeploy.parameters.json
index 5b0dfdbae..473cf08cd 100644
--- a/deploy/az/sql/sqldeploy.parameters.json
+++ b/deploy/az/sql/sqldeploy.parameters.json
@@ -4,9 +4,7 @@
   "parameters": {
     "sql_server": {
       "value": {
-        "name": "eshop-sqlsrv",
-        "admin": "eshop",
-        "adminpwd": "Pass@word",
+        "name": "eshopsql",
         "dbs": {
           "ordering": "orderingdb",
           "identity": "identitydb",
@@ -14,8 +12,11 @@
         }
       }
     },
-    "suffix": {
-      "value": "edu"
+    "admin": {
+      "value": null
+    },
+    "adminpwd": {
+      "value": null
     }
   }
-}
+}
\ No newline at end of file