Fixes to problems with conflicting userEmail button and comments entry.