Admin check added, required fields added