you can put the form parts from step 2 into the $tpl_temp and it will still work. a little easier as well.
PS also the Username, Password, and Login (submit button text) labels can be changed to $lang_common['Username'], $lang_common['Password'], and $lang_common['Login'] respectively to allow for non-english forums.