Make mail password optional