Client Portal with Login Shortcode

I’ve followed along with the Client Portal video tutorial here: http://www.youtube.com/watch?v=BBltDUopo1U Very useful and exactly what I’m looking for. But I have one stumbling block. I don’t want to use – and more importantly I don’t want my clients to use – the native WP Login page which is very limiting and not inside my theme. Similarly, I want to avoid the custom login page packaged with s2Member for the same reason.

So I want to use WP’s login shortcode inside a page. I’m all set up and the client portal login functions exactly as planned when I use the native WordPress login page. But it does not function when I use my login shortcode (embedded in a page). So the tricky programmatic bit is my shortcode login programming is not picking up or not passing your important bit: %%current_user_login%%. So the native WP login successfully picks up and passes %%current_user_login%% but my login shortcode does not collect or does not pass %%current_user_login%%. I can’t figure out why not. Any suggestions for getting %%current_user_login%% to work with a login shortcode. My login shortcode function is included below.

add_action( 'init', 'my_add_shortcodes' );
function my_add_shortcodes() {
	add_shortcode( 'my_login_form', 'my_login_form_shortcode' );
}

function my_login_form_shortcode() {
	if ( is_user_logged_in() )
		// user is already logged in, so show log out link. 
		return "<a title="Click to Logout">&raquo;&nbsp;Click to Logout</a>"; 
		// not logged in :: show log in form 
	return wp_login_form( array( 'echo' =&gt; false,
	 					'form_id' =&gt; 'loginform',
						'label_username' =&gt; __( 'Username' ),
						'label_password' =&gt; __( 'Password' ),
						'label_remember' =&gt; __( 'Remember Me' ),
						'label_log_in' =&gt; __( 'Log In' ),
						'id_username' =&gt; 'user_login',
						'id_password' =&gt; 'user_pass',
						'id_remember' =&gt; 'rememberme',
						'id_submit' =&gt; 'wp-submit',
						'remember' =&gt; true,
						'value_username' =&gt; '',
						'value_remember' =&gt; false // Set this to true to default the "Remember me" checkbox to checked
					));
}

If I can solve this last bit, I will be good to go and I will be so happy. And I am sure other users who want to create a Client Portal with a thematic login page will be pleased as well. Thank you.