removing i18n defined or die statements
login bug fix