fixed bugs on user activation