Removed unnecessary check during account activation
Merge remote-tracking branch 'origin/master'