Security and password fix