Fixed checks when submitting and added extra permissions