With/Without validation temporarily removed. not sure this will fix the safari problem tho