Case #4173 - Fixed issues with buttons for non-contributors