The term of office of the Mayor in office when this charter is adopted continues until the beginning of the first odd-numbered year after that time. A Mayor will be elected for a two-year term at the time this charter is adopted. At each general election, a mayor shall be elected for a two-year term.