Automatically redirect users to where they came from upon logging in and out. Warning this does cause a problem when logging out from a restricted content page.

RCP_login_redirect.php

                                <?php

                                function mg_rcp_hijack_login_url() {
                                    global $rcp_options;

                                    if( isset( $rcp_options['login_redirect'] ) ) {
                                        $login_url = get_the_permalink( $rcp_options['login_redirect'] );
                                    }
                                    return $login_url;
                                }


                                function mg_login_logout( $args, $content, $tag ) {

                                    if (is_user_logged_in()){
                                        $href = wp_logout_url( get_the_permalink() );
                                    }
                                    else{

                                        $redirect = get_the_permalink();
                                        $login_url = mg_rcp_hijack_login_url();

                                        if ( !empty($redirect) )
                                            $login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);

                                        $href = $login_url;

                                    }

                                    return $href;

                                }

                                add_shortcode( 'login-logout-button', 'mg_login_logout' );

                                function add_login_redirect_filter( $vars ){
                                    $vars[] = "redirect_to";
                                    return $vars;
                                }
                                add_filter( 'query_vars', 'add_login_redirect_filter' );

                                ?>

                                <input type="hidden" name="rcp_redirect" value="<?php echo esc_url(get_query_var('redirect_to')); ?>" />
                                <input type="hidden" name="rcp_login_nonce" value="<?php echo wp_create_nonce( 'rcp-login-nonce' ); ?>"/>