Fixed the resident form
Merge branch 'master' into kingman