Merge "Add password recovery procedure for default admin user"