diff --git a/src/components/LoginForm.js b/src/components/LoginForm.js
index 1e9101a..348da17 100644
--- a/src/components/LoginForm.js
+++ b/src/components/LoginForm.js
@@ -195,8 +195,12 @@ export default class LoginForm extends React.Component {
   _performRedirect() {
     var router = context.getRouter();
     var homeRoute = router.getHomeRoute();
+    var logoutRoute = router.getLogoutRoute();
     var authenticatedHomeRoute = router.getAuthenticatedHomeRoute();
-    var redirectTo = this.props.redirectTo || (authenticatedHomeRoute || {}).path || (homeRoute || {}).path || '/';
+    var { location } = this.props;
+    var passthru = (location && location.state) ? location.state.nextPathname : null;
+    if ( passthru == ( logoutRoute || {} ).path ) passthru = null;
+    var redirectTo = this.props.redirectTo || passthru || (authenticatedHomeRoute || {}).path || (homeRoute || {}).path || '/';
 
     this.history.pushState(null, redirectTo);
   }