Revert "use "current_user" if excplicitely set"

This reverts commit b1592a1d51f167b48e41bfe0e7e4ba503735a9c7.