How can I edit Custom Form API?
Why not use the existing user edit form, and use hook_form_alter() to add your fields. That way, you get all the built in functionality, such as password changing etc. 

It would also make sense to make the user registration alterations the same way, instead of creating your own flow, unless it for some other reason makes sense to do it that way.