Bug fixes and added proper 404 error code on account not found