I see now. Both passwords are correct, using either one will work. I'd probably just leave the password as is in the file.The WIki asks line 25 to be modified with the appropriate password
The wiki was modified that way because a few years ago there was a different password. Guess we need to remove that piece now.
I would recommend you execute as stated in the wiki (root). What do you mean admin?
Did you install using Express DVD or Minimal Install CD? The Express DVD often causes issues for most users.
Starting over is probably best. Hopefully it'll work out this time. Also ensure all your shares are owned by the first admin user:users.