Merge pull request #45 from shadowglen/master

Fix issue #44
Fix same bug as issue #44 in user page