Standardize the authenicate call and also fix up more JPA annotation issues