diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index 7ab267b0f..38c6a8650 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -28,3 +28,4 @@ export { default as Label } from './components/Label';
 export { default as FlagLabel } from './components/FlagLabel';
 export { default as Dropdown } from './components/Dropdown';
 export { default as Option } from './components/Option';
+export { default as BareButton } from './components/BareButton';
diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 974c4609f..fc6159544 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -26,3 +26,4 @@ export {
 export {
   default as StreamConfiguration,
 } from 'coral-framework/components/StreamConfiguration';
+export { default as Recaptcha } from 'coral-framework/components/Recaptcha';
diff --git a/plugins/talk-plugin-auth/client/login/components/External.js b/plugins/talk-plugin-auth/client/login/components/External.js
index 048a9269a..9d57d63db 100644
--- a/plugins/talk-plugin-auth/client/login/components/External.js
+++ b/plugins/talk-plugin-auth/client/login/components/External.js
@@ -1,21 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import t from 'coral-framework/services/i18n';
 import styles from './External.css';
 import { Slot } from 'plugin-api/beta/client/components';
 import { IfSlotIsNotEmpty } from 'plugin-api/beta/client/components';
+import { t } from 'plugin-api/beta/client/services';
 
 const External = ({ slot }) => (
-  <div>
-    <IfSlotIsNotEmpty slot={slot}>
+  <IfSlotIsNotEmpty slot={slot}>
+    <div>
       <div className={styles.external}>
         <Slot fill={slot} />
       </div>
       <div className={styles.separator}>
         <h1>{t('sign_in.or')}</h1>
       </div>
-    </IfSlotIsNotEmpty>
-  </div>
+    </div>
+  </IfSlotIsNotEmpty>
 );
 
 External.propTypes = {
diff --git a/plugins/talk-plugin-auth/client/login/components/ForgotPassword.js b/plugins/talk-plugin-auth/client/login/components/ForgotPassword.js
index 12a309c28..9a5816b38 100644
--- a/plugins/talk-plugin-auth/client/login/components/ForgotPassword.js
+++ b/plugins/talk-plugin-auth/client/login/components/ForgotPassword.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styles from './ForgotPassword.css';
 import { Button, TextField } from 'plugin-api/beta/client/components/ui';
-import t from 'coral-framework/services/i18n';
+import { t } from 'plugin-api/beta/client/services';
 
 class ForgotPassword extends React.Component {
   handleSignUpLink = e => {
diff --git a/plugins/talk-plugin-auth/client/login/components/ResendEmailConfirmation.js b/plugins/talk-plugin-auth/client/login/components/ResendEmailConfirmation.js
index 082492128..7c15e9fc7 100644
--- a/plugins/talk-plugin-auth/client/login/components/ResendEmailConfirmation.js
+++ b/plugins/talk-plugin-auth/client/login/components/ResendEmailConfirmation.js
@@ -5,9 +5,9 @@ import {
   Success,
   Alert,
 } from 'plugin-api/beta/client/components/ui';
+import { t } from 'plugin-api/beta/client/services';
 import PropTypes from 'prop-types';
 import styles from './ResendEmailConfirmation.css';
-import t from 'coral-framework/services/i18n';
 
 class ResendVerification extends React.Component {
   handleSubmit = e => {
diff --git a/plugins/talk-plugin-auth/client/login/components/SignIn.js b/plugins/talk-plugin-auth/client/login/components/SignIn.js
index 6eda7db37..9f7fe42b5 100644
--- a/plugins/talk-plugin-auth/client/login/components/SignIn.js
+++ b/plugins/talk-plugin-auth/client/login/components/SignIn.js
@@ -7,9 +7,9 @@ import {
   Alert,
 } from 'plugin-api/beta/client/components/ui';
 import styles from './SignIn.css';
-import t from 'coral-framework/services/i18n';
+import { t } from 'plugin-api/beta/client/services';
 import cn from 'classnames';
-import Recaptcha from 'coral-framework/components/Recaptcha';
+import { Recaptcha } from 'plugin-api/beta/client/components';
 import External from './External';
 
 class SignIn extends React.Component {
diff --git a/plugins/talk-plugin-auth/client/login/components/SignUp.js b/plugins/talk-plugin-auth/client/login/components/SignUp.js
index 842f41051..5de46f9ad 100644
--- a/plugins/talk-plugin-auth/client/login/components/SignUp.js
+++ b/plugins/talk-plugin-auth/client/login/components/SignUp.js
@@ -7,7 +7,7 @@ import {
   Success,
   Alert,
 } from 'plugin-api/beta/client/components/ui';
-import t from 'coral-framework/services/i18n';
+import { t } from 'plugin-api/beta/client/services';
 import styles from './SignUp.css';
 import External from './External';