Realized that there were some problems with the authentication and common modules, so fixed them here.