diff --git a/client/src/app-components/language-selector.js b/client/src/app-components/language-selector.js
index e4bce9ba..127ed793 100644
--- a/client/src/app-components/language-selector.js
+++ b/client/src/app-components/language-selector.js
@@ -28,7 +28,7 @@ class LanguageSelector extends React.Component {
         return {
             className: this.getClass(),
             items: this.getLanguageList(),
-            selectedIndex: languages.map((key) => codeLanguages[key]).indexOf(this.getPropLanguage()),
+            selectedIndex: this.getSelectedIndex(),
             onChange: this.changeLanguage.bind(this)
         };
     }
@@ -52,6 +52,12 @@ class LanguageSelector extends React.Component {
         });
     }
 
+    getSelectedIndex() {
+        let selectedIndex = languages.map((key) => codeLanguages[key]).indexOf(this.getPropLanguage());
+
+        return (selectedIndex != -1) ? selectedIndex : undefined;
+    }
+
     getPropLanguage() {
         let language = this.props.language;
 
diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js
index 5b5b9e75..63e76034 100644
--- a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js
+++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js
@@ -2,8 +2,9 @@ import React from 'react';
 import {connect}  from 'react-redux';
 
 import i18n from 'lib-app/i18n';
-
 import AdminDataActions from 'actions/admin-data-actions';
+
+import Icon from 'core-components/icon';
 import Header from 'core-components/header';
 import Listing from 'core-components/listing';
 import Loading from 'core-components/loading';
@@ -60,7 +61,14 @@ class AdminPanelCustomResponses extends React.Component {
     getItems() {
         return this.props.items.map((item) => {
             return {
-                content: item.name
+                content: (
+                    <span>
+                        {item.name}
+                        <span className="admin-panel-custom-responses__item-flag">
+                            <Icon name={(item.language != 'en') ? item.language : 'us'}/>
+                        </span>
+                    </span>
+                )
             };
         });
     }
diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss
index d82bbc65..6e339b5e 100644
--- a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss
+++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss
@@ -2,4 +2,8 @@
     &__loading {
         height: 300px;
     }
+
+    &__item-flag {
+        float: right;
+    }
 }
\ No newline at end of file