Adding a better authentication mechanism system