fix to allow no passing in of current_user
slight refactor
Merge pull request #1070 from affektive/no_current_user

fix to allow no passing in of current_user