Fix for incorrect "right" buttons, security object manually added to session