Changes to make password protection possible