diff --git a/src/components/Login.vue b/src/components/Login.vue
index a0bd8795..d891f764 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -1,6 +1,15 @@
 <template>
   <div>
     <form ref="form" novalidate @submit.stop.prevent="handleSubmit" @reset="handleReset">
+      <b-form-group label="Bot Name" label-for="name-input">
+        <b-form-input
+          id="name-input"
+          v-model="auth.botName"
+          required
+          placeholder="Bot Name"
+          @keydown.enter.native="handleOk"
+        ></b-form-input>
+      </b-form-group>
       <b-form-group
         :state="urlState"
         label="API Url"
@@ -26,6 +35,7 @@
           v-model="auth.username"
           :state="nameState"
           required
+          placeholder="Freqtrader"
           @keydown.enter.native="handleOk"
         ></b-form-input>
       </b-form-group>
@@ -84,6 +94,7 @@ export default class Login extends Vue {
   };
 
   auth: AuthPayload = {
+    botName: '',
     url: defaultURL,
     username: '',
     password: '',
diff --git a/src/shared/userService.ts b/src/shared/userService.ts
index 2cf1c282..d49692c2 100644
--- a/src/shared/userService.ts
+++ b/src/shared/userService.ts
@@ -56,6 +56,7 @@ export class UserService {
       return info[this.botId];
     }
     return {
+      botName: '',
       apiUrl: '',
       refreshToken: '',
       accessToken: '',
@@ -100,6 +101,7 @@ export class UserService {
     );
     if (result.data.access_token && result.data.refresh_token) {
       const obj: AuthStorage = {
+        botName: auth.botName,
         apiUrl: auth.url,
         accessToken: result.data.access_token || '',
         refreshToken: result.data.refresh_token || '',
@@ -169,6 +171,7 @@ export class UserService {
       typeof accessToken === 'string'
     ) {
       const loginInfo: AuthStorage = {
+        botName: '',
         apiUrl,
         refreshToken,
         accessToken,
diff --git a/src/store/modules/botStoreWrapper.ts b/src/store/modules/botStoreWrapper.ts
index 6fe116b0..abc61adc 100644
--- a/src/store/modules/botStoreWrapper.ts
+++ b/src/store/modules/botStoreWrapper.ts
@@ -31,7 +31,7 @@ export default function createBotStore(store) {
     },
     [MultiBotStoreGetters.nextBotId](state: FTMultiBotState): string {
       let botCount = state.availableBots.length;
-      while (`ftbot.${botCount}` in state.availableBots) {
+      while (state.availableBots.includes(`ftbot.${botCount}`)) {
         botCount += 1;
       }
       return `ftbot.${botCount}`;
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 34f7a147..ae63561e 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -1,10 +1,12 @@
 export interface AuthPayload {
+  botName: string;
   url: string;
   username: string;
   password: string;
 }
 
 export interface AuthStorage {
+  botName: string;
   apiUrl: string;
   refreshToken: string;
   accessToken: string;