diff --git a/client/src/app-components/ticket-event.js b/client/src/app-components/ticket-event.js
index ebab5f20..ba6fa9e5 100644
--- a/client/src/app-components/ticket-event.js
+++ b/client/src/app-components/ticket-event.js
@@ -80,6 +80,9 @@ class TicketEvent extends React.Component {
     }
 
     renderComment() {
+        const {author} = this.props.author;
+        const customFields = (author && author.customfields) || [];
+
         return (
             <div className="ticket-event__comment">
                 <span className="ticket-event__comment-pointer" />
@@ -88,7 +91,7 @@ class TicketEvent extends React.Component {
                     <span className="ticket-event__comment-badge-container">
                         <span className="ticket-event__comment-badge">{i18n((this.props.author.staff) ? 'STAFF' : 'CUSTOMER')}</span>
                     </span>
-                    {this.props.author.customfields.map(this.renderCustomFieldValue.bind(this))}
+                    {customFields.map(this.renderCustomFieldValue.bind(this))}
                     {(this.props.private*1) ? this.renderPrivateBadge() : null}
                 </div>
                 <div className="ticket-event__comment-date">{DateTransformer.transformToString(this.props.date)}</div>
diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js
index 87012c71..fd724874 100644
--- a/client/src/app-components/ticket-viewer.js
+++ b/client/src/app-components/ticket-viewer.js
@@ -11,7 +11,6 @@ import MentionsParser     from 'lib-app/mentions-parser';
 
 import TicketEvent        from 'app-components/ticket-event';
 import AreYouSure         from 'app-components/are-you-sure';
-import DateTransformer    from 'lib-core/date-transformer';
 import Form               from 'core-components/form';
 import FormField          from 'core-components/form-field';
 import SubmitButton       from 'core-components/submit-button';
@@ -67,7 +66,6 @@ class TicketViewer extends React.Component {
 
     render() {
         const ticket = this.props.ticket;
-        console.log('tickett',ticket)
 
         return (
             <div className="ticket-viewer">
diff --git a/client/src/app/admin/panel/users/admin-panel-custom-fields.js b/client/src/app/admin/panel/users/admin-panel-custom-fields.js
index 0b342289..c93b0195 100644
--- a/client/src/app/admin/panel/users/admin-panel-custom-fields.js
+++ b/client/src/app/admin/panel/users/admin-panel-custom-fields.js
@@ -43,9 +43,9 @@ class AdminPanelCustomFields extends React.Component {
             <Table
                 className="admin-panel-custom-fields__list"
                 headers={[
-                    {key: 'name', value: 'Name'},
-                    {key: 'type', value: 'Type'},
-                    {key: 'options', value: 'Options'},
+                    {key: 'name', value: i18n('NAME')},
+                    {key: 'type', value: i18n('TYPE')},
+                    {key: 'options', value: i18n('OPTIONS')},
                     {key: 'actions', value: ''},
                 ]}
                 rows={this.state.customFields.map(this.getCustomField.bind(this))}
diff --git a/client/src/core-components/tag-selector.scss b/client/src/core-components/tag-selector.scss
index d03e4712..e8d9311c 100644
--- a/client/src/core-components/tag-selector.scss
+++ b/client/src/core-components/tag-selector.scss
@@ -7,7 +7,7 @@
   &__drop-down {
     .drop-down__current-item {
       cursor: text;
-      background-color: white;
+      background-color: $very-light-grey;
       border: 1px solid $grey;
       min-height: 38px;