Improved login security and removed theme includes