diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 5c884dfd1..007622d80 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -128,13 +128,16 @@ export function logOut() {
 
 export function register(params) {
   return (dispatch, getState) => {
+    const needsConfirmation = getState().getIn(['instance', 'pleroma', 'metadata', 'account_activation_required']);
     dispatch({ type: AUTH_REGISTER_REQUEST });
     return dispatch(createAppAndToken()).then(() => {
       return api(getState, 'app').post('/api/v1/accounts', params);
     }).then(response => {
       dispatch({ type: AUTH_REGISTER_SUCCESS, token: response.data });
       dispatch(authLoggedIn(response.data));
-      return dispatch(fetchMe());
+      return needsConfirmation
+        ? dispatch(showAlert('', 'Check your email for further instructions.'))
+        : dispatch(fetchMe());
     }).catch(error => {
       dispatch({ type: AUTH_REGISTER_FAIL, error });
       throw error;