Changed form & template for User entity