diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index ba30c9a073eb67e5d14a48cba41f21f38c63fcb9..7f27bc186072f50cb616145daf0d596c4b12d79d 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -85,6 +85,15 @@
                             {% endfor %}
                         </select>
                     </div>
+                    {% if rememberOrganizationEnabled is defined -%}
+                    <div class="pure-controls pure-form-message">
+                        <label for="remember_organization" class="pure-checkbox">
+ 	                    <input type="checkbox" id="remember_organization" tabindex="5" name="remember_organization" value="Yes"
+                                {{ rememberOrganizationChecked ? 'checked="checked"' }} />
+                            <small>{{ 'Remember my organization'|trans }}</small>
+                        </label>
+                    </div>
+                    {%- endif %}
                 </div> <!--pure-control-group-->
             {%- endif %}