Misleading for registering user

So we have several optional roles for registering users to choose from. When somebody registers without selecting any of these roles it is setup to simply log them in without admin approval or email confirmation, but when they select one of the roles that require admin approval it should tell the person that their account is awaiting admin approval right? Well it currently doesn't.

When I select one of those roles while registering it still tells me "Registration successful. You are now logged in." and also send a confirmation email with username and password without any mention of the fact that their account is pending approval. It does however send the "Account activation email" once the account is changed to active so that is good.

So it would be nice if this module overrode any other settings and used the "Welcome, awaiting administrator approval" email that is defined in the user settings when a user selects one of the approval required roles. It would also be nice if it displayed a system message that says that their account is awaiting approval rather than "Registration successful. You are now logged in."

Thanks!