SAM #51: HotFix for Buddyrequest. See Ticket and MR for more Info

Notes
=====

Hotfix for BuddyRequest.
For Details see Ticket #51