Remove generate password and fix activitys cross reference