diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
index 33bfe06c4..0fa318ad2 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
@@ -707,7 +707,7 @@ class App.ControllerForm extends App.Controller
     # richtext
     else if attribute.tag is 'richtext'
       item = $( App.view('generic/richtext')( attribute: attribute ) )
-      item.ce(
+      item.find('[contenteditable]').ce(
         mode: attribute.type
         maxlength: attribute.maxlength
       )
diff --git a/app/assets/javascripts/app/controllers/_click_catcher.js.coffee b/app/assets/javascripts/app/controllers/_click_catcher.js.coffee
index 751768872..702a9b5d9 100644
--- a/app/assets/javascripts/app/controllers/_click_catcher.js.coffee
+++ b/app/assets/javascripts/app/controllers/_click_catcher.js.coffee
@@ -2,15 +2,15 @@ class App.clickCatcher extends Spine.Controller
   # clickCatcher has no template because it's a plain <div>
   className: 'clickCatcher'
 
-  constructor: (holder, callback, zIndexScale) ->
+  constructor: ->
     super
     @render() if @callback and @holder
 
-  triggerCallback: (event) =>
-    event.stopPropagation()
+  triggerCallback: (e) =>
+    e.stopPropagation()
     @callback()
     @remove()
-  
+
   render: ->
     @el.addClass("zIndex-#{ @zIndexScale }") if @zIndexScale
     @el.on('click', @triggerCallback)
diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
index f49f276e4..a4e562c1f 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
@@ -272,7 +272,7 @@ class App.TicketCreate extends App.Controller
 
     # show text module UI
     @textModule = new App.WidgetTextModule(
-      el: @el.find('[data-name="body"]')
+      el: @el.find('[data-name="body"]').parent()
     )
 
     new Sidebar(
diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index 90871baf6..b188360df 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -594,6 +594,7 @@ class App.TicketZoom extends App.Controller
     )
 
   taskGet: (area) =>
+    return {} if !App.TaskManager.get(@task_key)
     @localTaskData = App.TaskManager.get(@task_key).state || {}
     if area
       if !@localTaskData[area]
@@ -967,11 +968,12 @@ class Edit extends App.Controller
         options:
           duration: duration
 
-  add_textarea_catcher: ->
-    @textareaCatcher = new App.clickCatcher
-      holder: @ticketEdit.offsetParent()
-      callback: @close_textarea
-      zIndexScale: 4
+  add_textarea_catcher: =>
+    if @ticketEdit.is(':visible')
+      @textareaCatcher = new App.clickCatcher
+        holder: @ticketEdit.offsetParent()
+        callback: @close_textarea
+        zIndexScale: 4
 
   remove_textarea_catcher: ->
     return if !@textareaCatcher
diff --git a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee
index 8bf4f74d4..487b4399b 100644
--- a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee
+++ b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee
@@ -1,10 +1,12 @@
 class App.UserOrganizationAutocompletion extends App.Controller
+  className: 'dropdown js-recipientDropdown zIndex-2'
   events:
     'hide.bs.dropdown .js-recipientDropdown': 'hideOrganisationMembers'
     'click .js-organisation':                 'showOrganisationMembers'
     'click .js-back':                         'hideOrganisationMembers'
     'click .js-user':                         'selectUser'
     'click .js-user-new':                     'newUser'
+    'focus input':                            'open'
 
   constructor: (params) ->
     super
@@ -18,14 +20,29 @@ class App.UserOrganizationAutocompletion extends App.Controller
   element: =>
     @el
 
+  open: =>
+    @el.addClass('open')
+    @catcher = new App.clickCatcher
+      holder:       @el.offsetParent()
+      callback:     @close
+      zIndexScale:  1
+
+  close: =>
+    @el.removeClass('open')
+    if @catcher
+      @catcher.remove()
+
   selectUser: (e) ->
     userId = $(e.target).parents('.recipientList-entry').data('user-id')
     if !userId
       userId = $(e.target).data('user-id')
+    @setUser(userId)
+    @close()
 
+  setUser: (userId) =>
     @el.find('[name="' + @attribute.name + '"]').val( userId ).trigger('change')
 
-  setUser: ->
+  executeCallback: ->
     userId = @el.find('[name="' + @attribute.name + '"]').val()
     return if !userId
     return if !App.User.exists(userId)
@@ -63,14 +80,17 @@ class App.UserOrganizationAutocompletion extends App.Controller
     @el.html App.view('generic/user_search/input')(
       attribute: @attribute
     )
+    if !@attribute.disableCreateUser
+      @el.find('.recipientList').append( @buildUserNew() )
+
     @el.find('[name="' + @attribute.name + '"]').on(
       'change',
       (e) =>
-        @setUser()
+        @executeCallback()
     )
 
     @el.find('[name="' + @attribute.name + '_completion"]').on(
-      'keyup',
+      'keydown',
       (e) =>
         item = $(e.target).val().trim()
 
@@ -78,14 +98,61 @@ class App.UserOrganizationAutocompletion extends App.Controller
 
         # clean input field on ESC
         if e.keyCode is 27
+
+          # if org member selection is shwon, go back to member list
+          if @$('.recipientList-backClickArea').is(':visible')
+            @$('.recipientList-backClickArea').click()
+            return
+
+          # empty user selection and close
           $(e.target).val('')
           item = ''
+          @close()
 
         # ignore arrow keys
-        return if e.keyCode is 37
-        return if e.keyCode is 38
-        return if e.keyCode is 39
-        return if e.keyCode is 40
+        if e.keyCode is 37
+          return
+
+        if e.keyCode is 39
+          return
+
+        # up / select upper item
+        if e.keyCode is 38
+          e.preventDefault()
+          recipientList = @$('.recipientList')
+          if recipientList.find('li.is-active').length is 0
+            recipientList.find('li').last().addClass('is-active')
+          else
+            if recipientList.find('li.is-active').prev().length isnt 0
+              recipientList.find('li.is-active').removeClass('is-active').prev().addClass('is-active')
+          return
+
+        # down / select lower item
+        if e.keyCode is 40
+          e.preventDefault()
+          recipientList = @$('.recipientList')
+          if recipientList.find('li.is-active').length is 0
+            recipientList.find('li').first().addClass('is-active')
+          else
+            if recipientList.find('li.is-active').next().length isnt 0
+              recipientList.find('li.is-active').removeClass('is-active').next().addClass('is-active')
+          return
+
+        # enter / take item
+        if e.keyCode is 13
+          e.preventDefault()
+          userId = @$('.recipientList').find('li.is-active').data('user-id')
+          if !userId
+            organisationId = @$('.recipientList').find('li.is-active').data('organisation-id')
+            if organisationId
+              @showOrganisationMembers(undefined, @$('.recipientList').find('li.is-active'))
+              return
+          if userId is 'new'
+            @newUser()
+          else
+            @setUser(userId)
+            @close()
+          return
 
         # ignore shift
         return if e.keyCode is 16
@@ -97,10 +164,10 @@ class App.UserOrganizationAutocompletion extends App.Controller
         return if e.keyCode is 18
 
         # hide dropdown
-        @el.find('.recipientList').html('')
-        @el.find('.recipientList-organisationMembers').remove()
+        @$('.recipientList').empty()
+        @$('.recipientList-organisationMembers').remove()
         if !item && !@attribute.disableCreateUser
-          @el.find('.recipientList').append( @buildUserNew() )
+          @$('.recipientList').append( @buildUserNew() )
 
         # show dropdown
         if item && ( !@attribute.minLengt || @attribute.minLengt <= item.length )
@@ -142,10 +209,11 @@ class App.UserOrganizationAutocompletion extends App.Controller
           @el.find('.recipientList').append( @buildUserNew() )
     )
 
-  showOrganisationMembers: (e) =>
-    e.stopPropagation()
+  showOrganisationMembers: (e,listEntry) =>
+    if e
+      e.stopPropagation()
+      listEntry = $(e.currentTarget)
 
-    listEntry = $(e.currentTarget)
     organisationId = listEntry.data('organisation-id')
 
     @recipientList = @$('.recipientList')
@@ -195,7 +263,8 @@ class App.UserOrganizationAutocompletion extends App.Controller
         complete: => @organisationList.addClass('hide')
 
   newUser: (e) =>
-    e.preventDefault()
+    if e
+      e.preventDefault()
     new UserNew(
       parent: @
     )
@@ -249,6 +318,7 @@ class UserNew extends App.ControllerModal
         # force to reload object
         callbackReload = (user) ->
           ui.parent.el.find('[name=customer_id]').val( user.id ).trigger('change')
+          ui.parent.close()
 
           # start customer info controller
           ui.hide()
diff --git a/app/assets/javascripts/app/views/generic/richtext.jst.eco b/app/assets/javascripts/app/views/generic/richtext.jst.eco
index e9aca481d..4722d928b 100644
--- a/app/assets/javascripts/app/views/generic/richtext.jst.eco
+++ b/app/assets/javascripts/app/views/generic/richtext.jst.eco
@@ -1 +1,3 @@
-<div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="form-control <%= @attribute.class %>"><%= @attribute.value %></div>
+<div class="richtext">
+  <div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="form-control <%= @attribute.class %>"><%= @attribute.value %></div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/user_search/input.jst.eco b/app/assets/javascripts/app/views/generic/user_search/input.jst.eco
index 498291aac..928b5dda4 100644
--- a/app/assets/javascripts/app/views/generic/user_search/input.jst.eco
+++ b/app/assets/javascripts/app/views/generic/user_search/input.jst.eco
@@ -1,12 +1,8 @@
-<div class="dropdown js-recipientDropdown">
-
-  <div class="dropdown-toggle u-positionOrigin" data-toggle="dropdown">
-    <input type="hidden" name="<%- @attribute.name %>" value="<%= @attribute.value %>">
-    <input name="<%- @attribute.name %>_completion" class="ui-autocomplete-input form-control" autocapitalize="off" placeholder="<%- @attribute.placeholder %>" autocomplete="off" role="textbox" aria-autocomplete="list" aria-haspopup="true">
-  </div>
-
-  <div class="dropdown-menu" aria-labelledby="customer_id">
-    <ul class="recipientList" role="menu"></ul>
-  </div>
+<div class="u-positionOrigin">
+  <input type="hidden" name="<%- @attribute.name %>" value="<%= @attribute.value %>">
+  <input name="<%- @attribute.name %>_completion" class="ui-autocomplete-input form-control" autocapitalize="off" placeholder="<%- @attribute.placeholder %>" autocomplete="off" role="textbox" aria-autocomplete="list" aria-haspopup="true">
+</div>
 
+<div class="dropdown-menu" aria-labelledby="customer_id">
+  <ul class="recipientList" role="menu"></ul>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/user_search/new_user.jst.eco b/app/assets/javascripts/app/views/generic/user_search/new_user.jst.eco
index 2bdddbd24..d3220ee07 100644
--- a/app/assets/javascripts/app/views/generic/user_search/new_user.jst.eco
+++ b/app/assets/javascripts/app/views/generic/user_search/new_user.jst.eco
@@ -1,4 +1,4 @@
-<li class="recipientList-entry recipientList-new u-clickable horizontal center js-user-new">
+<li class="recipientList-entry recipientList-new u-clickable horizontal center js-user-new" data-user-id="new">
   <div class="recipientList-iconSpacer centered">
     <div class="white plus icon"></div>
   </div>
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb
index c6d723a33..3b2345bd6 100644
--- a/app/assets/stylesheets/zzz.css.erb
+++ b/app/assets/stylesheets/zzz.css.erb
@@ -442,7 +442,7 @@ label {
   margin-top: 0;
 }
 
-.form-group .controls {
+.form-group .controls .richtext {
   position: relative;
 }