New Admin-EndUser message + few changes

Signed-off-by: Martin Tange <mktange@gmail.com>