Template fix - lock warning was always displayed