Authotkey generation fix. Also load fix if layout isn't listed