diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6beb9bf6..b86410d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.4 (2020-06-19)
+
+- added 3.11 data
+- added `Character Name` setting as fallback
+
 ## 1.0.3 (2020-06-18)
 
 - fixed a unhandled error if no event data is available
diff --git a/manifest.json b/manifest.json
index 4e303c88..973de3e0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
     "meta": {
         "name": "PoE Overlay",
         "author": "Kyusung4698",
-        "version": "1.0.3",
+        "version": "1.0.4",
         "minimum-overwolf-version": "0.147.0",
         "description": "Search the market and send trade offers. Get current market values for your item. View insights for maps and items.",
         "dock_button_title": "PoE Overlay",
diff --git a/overlay.babel b/overlay.babel
index aa4827ec..1e7cf355 100644
--- a/overlay.babel
+++ b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.0" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.0">
     <!--
 
     BabelEdit project file
@@ -12106,6 +12106,59 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <concept_node>
+                        <name>character-name</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <concept_node>
                         <name>dialog</name>
                         <definition_loaded>false</definition_loaded>
diff --git a/package.json b/package.json
index ceb9239c..9dff9a94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay-overwolf",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "scripts": {
     "watch": "ng build --watch",
     "watch:prod": "ng build --watch --prod",
diff --git a/src/app/core/feature/feature-settings.ts b/src/app/core/feature/feature-settings.ts
index d1038879..58cd9838 100644
--- a/src/app/core/feature/feature-settings.ts
+++ b/src/app/core/feature/feature-settings.ts
@@ -6,4 +6,5 @@ export interface FeatureSettings {
     leagueId?: string;
     uiLanguage?: UiLanguage;
     dialogOpacity?: number;
+    characterName?: string;
 }
diff --git a/src/app/layout/component/settings-form/settings-form.component.html b/src/app/layout/component/settings-form/settings-form.component.html
index 7bb3023a..50f1c379 100644
--- a/src/app/layout/component/settings-form/settings-form.component.html
+++ b/src/app/layout/component/settings-form/settings-form.component.html
@@ -1,6 +1,6 @@
 <app-card [title]="'settings.game-settings' | translate" appAnnotation="settings.game-settings">
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-3">
             <mat-form-field>
                 <mat-label>{{'app.language' | translate}}</mat-label>
                 <mat-select [(value)]="settings.language" (valueChange)="onLanguageChange()">
@@ -10,7 +10,7 @@
                 </mat-select>
             </mat-form-field>
         </div>
-        <div class="col-md-6">
+        <div class="col-md-3">
             <mat-form-field>
                 <mat-label>{{'settings.league' | translate}}</mat-label>
                 <mat-select [(value)]="settings.leagueId" (valueChange)="onChange()">
@@ -20,6 +20,12 @@
                 </mat-select>
             </mat-form-field>
         </div>
+        <div class="col-md-6">
+            <mat-form-field>
+                <mat-label>{{'settings.character-name' | translate}}</mat-label>
+                <input matInput [(ngModel)]="settings.characterName" (ngModelChange)="onChange()">
+            </mat-form-field>
+        </div>
     </div>
 </app-card>
 
diff --git a/src/app/modules/commands/commands.module.ts b/src/app/modules/commands/commands.module.ts
index 9bf251c2..622a6a90 100644
--- a/src/app/modules/commands/commands.module.ts
+++ b/src/app/modules/commands/commands.module.ts
@@ -81,7 +81,7 @@ export class CommandsModule implements FeatureModule<CommandsFeatureSettings> {
                 const index = +hotkey.replace('command', '');
                 const { text } = settings.commands[index - 1];
                 if (text?.length) {
-                    this.command.execute(text).subscribe(() => { }, error => {
+                    this.command.execute(text, settings).subscribe(() => { }, error => {
                         console.warn(`Could not execute command.`, error, text);
                         this.notification.show('commands.execute-error');
                     });
diff --git a/src/app/modules/commands/service/command.service.ts b/src/app/modules/commands/service/command.service.ts
index ae8c329b..853a1b09 100644
--- a/src/app/modules/commands/service/command.service.ts
+++ b/src/app/modules/commands/service/command.service.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { ChatService } from '@shared/module/poe/chat';
 import { EventService } from '@shared/module/poe/event';
-import { Observable, of } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { Observable, of, throwError } from 'rxjs';
+import { flatMap } from 'rxjs/operators';
+import { CommandsFeatureSettings } from '../commands-feature-settings';
 
 @Injectable({
     providedIn: 'root'
@@ -13,14 +14,21 @@ export class CommandService {
         private readonly chat: ChatService,
         private readonly event: EventService) { }
 
-    public execute(command: string): Observable<void> {
+    public execute(command: string, settings: CommandsFeatureSettings): Observable<void> {
         if (command.includes('@char')) {
             return this.event.getCharacter().pipe(
-                map(character => {
+                flatMap(character => {
                     if (character?.name?.length) {
                         command = command.replace('@char', character.name);
+                    } else {
+                        if (settings.characterName?.length) {
+                            command = command.replace('@char', settings.characterName);
+                        } else {
+                            return throwError('character name was not set.');
+                        }
                     }
-                    return this.chat.send(command);
+                    this.chat.send(command);
+                    return of(null);
                 })
             );
         } else {
diff --git a/src/app/modules/trade/component/trade-message/trade-message.component.ts b/src/app/modules/trade/component/trade-message/trade-message.component.ts
index e8357b00..b7cec51b 100644
--- a/src/app/modules/trade/component/trade-message/trade-message.component.ts
+++ b/src/app/modules/trade/component/trade-message/trade-message.component.ts
@@ -182,6 +182,9 @@ export class TradeMessageComponent implements OnInit {
           if (character?.name?.length) {
             return of(character.name);
           }
+          if (this.settings.characterName?.length) {
+            return of(this.settings.characterName);
+          }
           return throwError('character name was not set.');
         })
       ).subscribe(name => this.chat.kick(name), error => {
diff --git a/src/assets/i18n/english.json b/src/assets/i18n/english.json
index e185a416..6ebd2062 100644
--- a/src/assets/i18n/english.json
+++ b/src/assets/i18n/english.json
@@ -371,6 +371,7 @@
 		"auto-download": "Download update automatically",
 		"auto-launch": "Run on Boot",
 		"cancel": "Cancel",
+		"character-name": "Character Name Fallback ",
 		"dialog": "Dialog",
 		"dialog-opacity": "Dialog Opacity",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/french.json b/src/assets/i18n/french.json
index c14ebbf8..59cbeae8 100644
--- a/src/assets/i18n/french.json
+++ b/src/assets/i18n/french.json
@@ -371,6 +371,7 @@
 		"auto-download": "Télécharger la mise à jour automatiquement",
 		"auto-launch": "Exécuter au démarrage",
 		"cancel": "Annuler",
+		"character-name": "Nom du personnage Fallback",
 		"dialog": "Dialogue",
 		"dialog-opacity": "Opacité de la boîte de dialogue",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/german.json b/src/assets/i18n/german.json
index d0509a62..d8343997 100644
--- a/src/assets/i18n/german.json
+++ b/src/assets/i18n/german.json
@@ -371,6 +371,7 @@
 		"auto-download": "Update automatisch herunterladen",
 		"auto-launch": "Beim Booten ausführen",
 		"cancel": "Abbrechen",
+		"character-name": "Charaktername Fallback",
 		"dialog": "Dialog",
 		"dialog-opacity": "Dialogopazität",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/korean.json b/src/assets/i18n/korean.json
index ee252835..21e0554b 100644
--- a/src/assets/i18n/korean.json
+++ b/src/assets/i18n/korean.json
@@ -371,6 +371,7 @@
 		"auto-download": "업데이트 자동 다운로드",
 		"auto-launch": "부팅시 실행",
 		"cancel": "취소",
+		"character-name": "캐릭터 이름 대체",
 		"dialog": "대화",
 		"dialog-opacity": "대화 상자 불투명도",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/polish.json b/src/assets/i18n/polish.json
index 6f2d2f6c..0078d029 100644
--- a/src/assets/i18n/polish.json
+++ b/src/assets/i18n/polish.json
@@ -371,6 +371,7 @@
 		"auto-download": "Pobierz aktualizację automatycznie",
 		"auto-launch": "Uruchom wraz ze startem systemu",
 		"cancel": "Anuluj",
+		"character-name": "Nazwa postaci Fallback",
 		"dialog": "Okno dialogowe",
 		"dialog-opacity": "Okno dialogowe Krycie",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/portuguese.json b/src/assets/i18n/portuguese.json
index 53a0dec5..310bb3d5 100644
--- a/src/assets/i18n/portuguese.json
+++ b/src/assets/i18n/portuguese.json
@@ -371,6 +371,7 @@
 		"auto-download": "Baixar atualização automaticamente",
 		"auto-launch": "Executar na inicialização",
 		"cancel": "Cancelar",
+		"character-name": "Nome do personagem Fallback",
 		"dialog": "Diálogo",
 		"dialog-opacity": "Opacidade da caixa de diálogo",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/russian.json b/src/assets/i18n/russian.json
index 178d8e63..017df7f7 100644
--- a/src/assets/i18n/russian.json
+++ b/src/assets/i18n/russian.json
@@ -371,6 +371,7 @@
 		"auto-download": "Скачивать обновления автоматически",
 		"auto-launch": "Запустить на включении",
 		"cancel": "Отменить",
+		"character-name": "Имя персонажа",
 		"dialog": "Диалог",
 		"dialog-opacity": "Непрозрачность диалога",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/simplified-chinese.json b/src/assets/i18n/simplified-chinese.json
index 4ffe2903..4c7cddd2 100644
--- a/src/assets/i18n/simplified-chinese.json
+++ b/src/assets/i18n/simplified-chinese.json
@@ -371,6 +371,7 @@
 		"auto-download": "自动下载更新",
 		"auto-launch": "开机运行",
 		"cancel": "取消",
+		"character-name": "角色名称后备",
 		"dialog": "对话",
 		"dialog-opacity": "对话不透明度",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/spanish.json b/src/assets/i18n/spanish.json
index 668194e6..ce9154fb 100644
--- a/src/assets/i18n/spanish.json
+++ b/src/assets/i18n/spanish.json
@@ -371,6 +371,7 @@
 		"auto-download": "Descargar actualización automáticamente",
 		"auto-launch": "Ejecutar en arranque",
 		"cancel": "Cancelar",
+		"character-name": "Nombre del personaje Fallback",
 		"dialog": "Diálogo",
 		"dialog-opacity": "Diálogo Opacidad",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/thai.json b/src/assets/i18n/thai.json
index 5e99b7c7..87190868 100644
--- a/src/assets/i18n/thai.json
+++ b/src/assets/i18n/thai.json
@@ -371,6 +371,7 @@
 		"auto-download": "ดาวน์โหลดอัปเดตโดยอัตโนมัติ",
 		"auto-launch": "ทำงานบน Boot",
 		"cancel": "ยกเลิก",
+		"character-name": "ชื่อตัวเลือกทางเลือก",
 		"dialog": "โต้ตอบ",
 		"dialog-opacity": "ความทึบของไดอะล็อก",
 		"dialog-spawn-position": {
diff --git a/src/assets/i18n/traditional-chinese.json b/src/assets/i18n/traditional-chinese.json
index f6fc223a..f587c8d2 100644
--- a/src/assets/i18n/traditional-chinese.json
+++ b/src/assets/i18n/traditional-chinese.json
@@ -371,6 +371,7 @@
 		"auto-download": "自動下載更新",
 		"auto-launch": "開機後自動啟動",
 		"cancel": "取消",
+		"character-name": "角色名稱後備",
 		"dialog": "對話",
 		"dialog-opacity": "對話不透明度",
 		"dialog-spawn-position": {