diff --git a/plugin-api/beta/client/actions/auth.js b/plugin-api/beta/client/actions/auth.js
new file mode 100644
index 000000000..85e2bd844
--- /dev/null
+++ b/plugin-api/beta/client/actions/auth.js
@@ -0,0 +1,5 @@
+export {
+  setAuthToken,
+  handleSuccessfulLogin,
+  logout,
+} from 'coral-framework/actions/auth';
diff --git a/plugin-api/beta/client/actions/stream.js b/plugin-api/beta/client/actions/stream.js
index 2751f4a17..bb3d465d9 100644
--- a/plugin-api/beta/client/actions/stream.js
+++ b/plugin-api/beta/client/actions/stream.js
@@ -1 +1,2 @@
 export { setSort } from 'coral-embed-stream/src/actions/stream';
+export { showSignInDialog } from 'coral-embed-stream/src/actions/login';
diff --git a/plugin-api/beta/client/hocs/index.js b/plugin-api/beta/client/hocs/index.js
index 0d7cac460..715ff56fa 100644
--- a/plugin-api/beta/client/hocs/index.js
+++ b/plugin-api/beta/client/hocs/index.js
@@ -1,10 +1,16 @@
 export { default as withReaction } from './withReaction';
 export { default as withTags } from './withTags';
 export { default as withSortOption } from './withSortOption';
-export { default as withFragments } from 'coral-framework/hocs/withFragments';
-export { default as excludeIf } from 'coral-framework/hocs/excludeIf';
-export { default as connect } from 'coral-framework/hocs/connect';
-export { default as withEmit } from 'coral-framework/hocs/withEmit';
+export {
+  connect,
+  withEmit,
+  excludeIf,
+  withFragments,
+  withForgotPassword,
+  withSignIn,
+  withSignUp,
+  withResendEmailConfirmation,
+} from 'coral-framework/hocs';
 export {
   withIgnoreUser,
   withBanUser,
diff --git a/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js b/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js
index 36ee1384e..9b1f6cb48 100644
--- a/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js
+++ b/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js
@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { withForgotPassword } from 'coral-framework/hocs';
+import { connect, withForgotPassword } from 'plugin-api/beta/client/hocs';
 import { compose } from 'recompose';
 import ForgotPassword from '../components/ForgotPassword';
-import { connect } from 'plugin-api/beta/client/hocs';
 import { bindActionCreators } from 'redux';
 import * as views from '../enums/views';
 import { setView, setEmail } from '../actions';
diff --git a/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js b/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js
index 3b4f4b564..bd7c9ad8c 100644
--- a/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js
+++ b/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js
@@ -1,9 +1,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { withResendEmailConfirmation } from 'coral-framework/hocs';
+import {
+  connect,
+  withResendEmailConfirmation,
+} from 'plugin-api/beta/client/hocs';
 import { compose } from 'recompose';
 import ResendEmailConfirmaton from '../components/ResendEmailConfirmation';
-import { connect } from 'plugin-api/beta/client/hocs';
 import { bindActionCreators } from 'redux';
 import * as views from '../enums/views';
 import { setView } from '../actions';
diff --git a/plugins/talk-plugin-auth/client/login/containers/SignIn.js b/plugins/talk-plugin-auth/client/login/containers/SignIn.js
index 3b84999fe..ac887d7d2 100644
--- a/plugins/talk-plugin-auth/client/login/containers/SignIn.js
+++ b/plugins/talk-plugin-auth/client/login/containers/SignIn.js
@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { withSignIn } from 'coral-framework/hocs';
+import { connect, withSignIn } from 'plugin-api/beta/client/hocs';
 import { compose } from 'recompose';
 import SignIn from '../components/SignIn';
-import { connect } from 'plugin-api/beta/client/hocs';
 import { bindActionCreators } from 'redux';
 import * as views from '../enums/views';
 import { setView, setEmail, setPassword } from '../actions';
diff --git a/plugins/talk-plugin-auth/client/login/containers/SignUp.js b/plugins/talk-plugin-auth/client/login/containers/SignUp.js
index 5eb5535d0..ea19a8940 100644
--- a/plugins/talk-plugin-auth/client/login/containers/SignUp.js
+++ b/plugins/talk-plugin-auth/client/login/containers/SignUp.js
@@ -1,13 +1,12 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { withSignUp } from 'coral-framework/hocs';
+import { connect, withSignUp } from 'plugin-api/beta/client/hocs';
 import { compose } from 'recompose';
 import SignUp from '../components/SignUp';
-import { connect } from 'plugin-api/beta/client/hocs';
 import { bindActionCreators } from 'redux';
 import * as views from '../enums/views';
 import { setView, setEmail, setPassword } from '../actions';
-import t from 'coral-framework/services/i18n';
+import { t } from 'plugin-api/beta/client/services';
 
 class SignUpContainer extends Component {
   state = {
diff --git a/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js b/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js
index 4fcd98ae3..875027a9b 100644
--- a/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js
+++ b/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { showSignInDialog } from 'coral-embed-stream/src/actions/login';
-import SignInButton from '../components//SignInButton';
+import { showSignInDialog } from 'plugin-api/beta/client/actions/stream';
+import SignInButton from '../components/SignInButton';
 
 const mapStateToProps = ({ auth }) => ({
   currentUser: auth.user,
diff --git a/plugins/talk-plugin-auth/client/stream/containers/UserBox.js b/plugins/talk-plugin-auth/client/stream/containers/UserBox.js
index ca50c7b6e..a4c68b3cf 100644
--- a/plugins/talk-plugin-auth/client/stream/containers/UserBox.js
+++ b/plugins/talk-plugin-auth/client/stream/containers/UserBox.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { logout } from 'coral-framework/actions/auth';
+import { logout } from 'plugin-api/beta/client/actions/auth';
 import UserBox from '../components/UserBox';
 
 const mapStateToProps = ({ auth }) => ({