Squashed commit of the following:

commit c8644ef9187b96bec26d9831e833af0498c76afb
Author: s7design <otrs@s7designcreative.com>
Date:   Mon Jun 23 14:28:32 2014 +0200

    Cleaned code for Previous Owner