diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 58f4b7ff02b673288878aa44671ba2a544556cc5..e48affe5fdee1a8ac4a99a8cf44d53b16ec0257b 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -65,7 +65,15 @@ extern TAOS *taos_connect_auth(const char *ip, const char *user, const char *aut
  */
 TAOS *shellInit(SShellArguments *_args) {
   printf("\n");
+#ifndef WINDOWS
   printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
+#else
+  if (!_args->is_use_passwd) {
+    strcpy(tsOsName, "Windows");
+    printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
+  }
+#endif
+
   fflush(stdout);
 
   // set options before initializing
@@ -74,7 +82,9 @@ TAOS *shellInit(SShellArguments *_args) {
   }
 
   if (_args->is_use_passwd) {
+#ifndef TD_WINDOWS
     if (_args->password == NULL) _args->password = getpass("Enter password: ");
+#endif
   } else {
     _args->password = TSDB_DEFAULT_PASS;
   }
@@ -170,7 +180,7 @@ static int32_t shellRunSingleCommand(TAOS *con, char *command) {
     system("clear");
     return 0;
   }
-  
+
   if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
     strtok(command, " \t");
     strtok(NULL, " \t");
@@ -182,7 +192,7 @@ static int32_t shellRunSingleCommand(TAOS *con, char *command) {
     }
     return 0;
   }
-  
+
   if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
     /* If source file. */
     char *c_ptr = strtok(command, " ;");
@@ -247,7 +257,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
       esc = false;
       continue;
     }
-    
+
     if (c == '\\') {
       esc = true;
       continue;
@@ -336,8 +346,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   }
 
   if (!tscIsUpdateQuery(pSql)) {  // select and show kinds of commands
-    int error_no = 0;    
-  
+    int error_no = 0;
+
     int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
     if (numOfRows < 0) {
       atomic_store_64(&result, 0);
@@ -530,7 +540,7 @@ static int dumpResultToFile(const char* fname, TAOS_RES* tres) {
     fprintf(fp, "%s", fields[col].name);
   }
   fputc('\n', fp);
-  
+
   int numOfRows = 0;
   do {
     int32_t* length = taos_fetch_lengths(tres);
@@ -716,7 +726,7 @@ static int verticalPrintResult(TAOS_RES* tres) {
 
   int numOfRows = 0;
   int showMore = 1;
-  do {  
+  do {
     if (numOfRows < resShowMaxNum) {
       printf("*************************** %d.row ***************************\n", numOfRows + 1);
 
@@ -851,7 +861,7 @@ static int horizontalPrintResult(TAOS_RES* tres) {
 
   int numOfRows = 0;
   int showMore = 1;
- 
+
   do {
     int32_t* length = taos_fetch_lengths(tres);
     if (numOfRows < resShowMaxNum) {
@@ -867,7 +877,7 @@ static int horizontalPrintResult(TAOS_RES* tres) {
         printf("[You can add limit statement to show more or redirect results to specific file to get all.]\n");
         showMore = 0;
     }
-    
+
     numOfRows++;
     row = taos_fetch_row(tres);
   } while(row != NULL);
@@ -909,7 +919,7 @@ void read_history() {
     if (errno != ENOENT) {
       fprintf(stderr, "Failed to open file %s, reason:%s\n", f_history, strerror(errno));
     }
-#endif    
+#endif
     return;
   }
 
@@ -934,9 +944,9 @@ void write_history() {
 
   FILE *f = fopen(f_history, "w");
   if (f == NULL) {
-#ifndef WINDOWS    
+#ifndef WINDOWS
     fprintf(stderr, "Failed to open file %s for write, reason:%s\n", f_history, strerror(errno));
-#endif    
+#endif
     return;
   }
 
@@ -982,13 +992,13 @@ void source_file(TAOS *con, char *fptr) {
   /*
   if (access(fname, F_OK) != 0) {
     fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
-    
+
     wordfree(&full_path);
     free(cmd);
     return;
   }
   */
-  
+
   FILE *f = fopen(fname, "r");
   if (f == NULL) {
     fprintf(stderr, "ERROR: failed to open file %s\n", fname);
diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c
index 0c70386061b99baaf2f9448ddadbb250685f23d4..4e00b0d8ff02819ee08a5ba537028e3835fcc945 100644
--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
@@ -71,7 +71,9 @@ int checkVersion() {
 // Global configurations
 SShellArguments args = {
   .host = NULL,
+#ifndef TD_WINDOWS
   .password = NULL,
+#endif
   .user = NULL,
   .database = NULL,
   .timezone = NULL,
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 87d11a3516a65e83201bf4ebe51f07e5394d5cdf..26aa632f04faa8aafa9aaee48e0703921b70210d 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -19,6 +19,9 @@
 
 extern char configDir[];
 
+char      WINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+
 void printVersion() {
   printf("version: %s\n", version);
 }
@@ -61,6 +64,8 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
+char g_password[MAX_PASSWORD_SIZE];
+
 void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   for (int i = 1; i < argc; i++) {
     // for host
@@ -73,11 +78,18 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
       }
     }
     // for password
-    else if (strcmp(argv[i], "-p") == 0) {
-      arguments->is_use_passwd = true;
-      if (i < argc - 1 && argv[i + 1][0] != '-') {
-        arguments->password = argv[++i];
-      }
+    else if (strncmp(argv[i], "-p", 2) == 0) {
+        arguments->is_use_passwd = true;
+        strcpy(tsOsName, "Windows");
+        printf(WINCLIENT_VERSION, tsOsName, taos_get_client_info());
+        if (strlen(argv[i]) == 2) {
+            printf("Enter password: ");
+            scanf("%s", g_password);
+            getchar();
+        } else {
+            tstrncpy(g_password, (char *)(argv[i] + 2), MAX_PASSWORD_SIZE);
+        }
+        arguments->password = g_password;
     }
     // for management port
     else if (strcmp(argv[i], "-P") == 0) {
@@ -104,7 +116,7 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     } else if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) {   
+      if (i < argc - 1) {
         char *tmp = argv[++i];
         if (strlen(tmp) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", tmp, TSDB_FILENAME_LEN - 1);
@@ -265,7 +277,7 @@ void *shellLoopQuery(void *arg) {
   if (command == NULL) return NULL;
 
   int32_t err = 0;
-  
+
   do {
     memset(command, 0, MAX_COMMAND_SIZE);
     shellPrintPrompt();
@@ -274,7 +286,7 @@ void *shellLoopQuery(void *arg) {
     err = shellReadCommand(con, command);
     if (err) {
       break;
-    }    
+    }
   } while (shellRunCommand(con, command) == 0);
 
   return NULL;
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index aad2fe95faf199a4359db3768b47b5c2dacd1448..b6c3a0040133769c69ac7e5d8182d325eda4c317 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -77,7 +77,7 @@ extern char configDir[];
 #define COL_BUFFER_LEN      ((TSDB_COL_NAME_LEN + 15) * TSDB_MAX_COLUMNS)
 
 #define MAX_USERNAME_SIZE  64
-#define MAX_PASSWORD_SIZE  16
+#define MAX_PASSWORD_SIZE  20
 #define MAX_HOSTNAME_SIZE  253      // https://man7.org/linux/man-pages/man7/hostname.7.html
 #define MAX_TB_NAME_SIZE   64
 #define MAX_DATA_SIZE      (16*TSDB_MAX_COLUMNS)+20     // max record len: 16*MAX_COLUMNS, timestamp string and ,('') need extra space