Moving AWS check to form helper