Fixed loggin to display forms based on users
fixed merge issues