BUGFIX: Removed username storage