diff --git a/includes/wc-account-functions.php b/includes/wc-account-functions.php
new file mode 100644
index 0000000000000..4e14716835719
--- /dev/null
+++ b/includes/wc-account-functions.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * WooCommerce Account Functions
+ *
+ * Functions for account specific things.
+ *
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce/Functions
+ * @version  2.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Returns the url to the lost password endpoint url.
+ *
+ * @access public
+ * @param  string $default_url
+ * @return string
+ */
+function wc_lostpassword_url( $default_url = '' ) {
+	$wc_password_reset_url = wc_get_page_permalink( 'myaccount' );
+
+	if ( false !== $wc_password_reset_url ) {
+		return wc_get_endpoint_url( 'lost-password', '', $wc_password_reset_url );
+	} else {
+		return $default_url;
+	}
+}
+
+add_filter( 'lostpassword_url', 'wc_lostpassword_url', 10, 1 );
+
+/**
+ * Get the link to the edit account details page.
+ *
+ * @return string
+ */
+function wc_customer_edit_account_url() {
+	$edit_account_url = wc_get_endpoint_url( 'edit-account', '', wc_get_page_permalink( 'myaccount' ) );
+
+	return apply_filters( 'woocommerce_customer_edit_account_url', $edit_account_url );
+}
+
+/**
+ * Get the edit address slug translation.
+ *
+ * @param  string  $id   Address ID.
+ * @param  bool    $flip Flip the array to make it possible to retrieve the values ​​from both sides.
+ *
+ * @return string        Address slug i18n.
+ */
+function wc_edit_address_i18n( $id, $flip = false ) {
+	$slugs = apply_filters( 'woocommerce_edit_address_slugs', array(
+		'billing'  => sanitize_title( _x( 'billing', 'edit-address-slug', 'woocommerce' ) ),
+		'shipping' => sanitize_title( _x( 'shipping', 'edit-address-slug', 'woocommerce' ) )
+	) );
+
+	if ( $flip ) {
+		$slugs = array_flip( $slugs );
+	}
+
+	if ( ! isset( $slugs[ $id ] ) ) {
+		return $id;
+	}
+
+	return $slugs[ $id ];
+}
diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php
index 59ee393f03077..423156acbafcc 100644
--- a/includes/wc-core-functions.php
+++ b/includes/wc-core-functions.php
@@ -23,6 +23,7 @@
 include( 'wc-order-functions.php' );
 include( 'wc-page-functions.php' );
 include( 'wc-product-functions.php' );
+include( 'wc-account-functions.php' );
 include( 'wc-term-functions.php' );
 include( 'wc-attribute-functions.php' );
 
diff --git a/includes/wc-page-functions.php b/includes/wc-page-functions.php
index 12ec88f1c740a..5bbadaa928385 100644
--- a/includes/wc-page-functions.php
+++ b/includes/wc-page-functions.php
@@ -4,10 +4,10 @@
  *
  * Functions related to pages and menus.
  *
- * @author 		WooThemes
- * @category 	Core
- * @package 	WooCommerce/Functions
- * @version     2.1.0
+ * @author   WooThemes
+ * @category Core
+ * @package  WooCommerce/Functions
+ * @version  2.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -107,60 +107,6 @@ function wc_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {
 	return apply_filters( 'woocommerce_get_endpoint_url', $url, $endpoint, $value, $permalink );
 }
 
-/**
- * Get the edit address slug translation.
- *
- * @param  string  $id   Address ID.
- * @param  bool    $flip Flip the array to make it possible to retrieve the values ​​from both sides.
- *
- * @return string        Address slug i18n.
- */
-function wc_edit_address_i18n( $id, $flip = false ) {
-	$slugs = apply_filters( 'woocommerce_edit_address_slugs', array(
-		'billing'  => sanitize_title( _x( 'billing', 'edit-address-slug', 'woocommerce' ) ),
-		'shipping' => sanitize_title( _x( 'shipping', 'edit-address-slug', 'woocommerce' ) )
-	) );
-
-	if ( $flip ) {
-		$slugs = array_flip( $slugs );
-	}
-
-	if ( ! isset( $slugs[ $id ] ) ) {
-		return $id;
-	}
-
-	return $slugs[ $id ];
-}
-
-/**
- * Returns the url to the lost password endpoint url.
- *
- * @access public
- * @param  string $default_url
- * @return string
- */
-function wc_lostpassword_url( $default_url = '' ) {
-	$wc_password_reset_url = wc_get_page_permalink( 'myaccount' );
-
-	if ( false !== $wc_password_reset_url ) {
-    	return wc_get_endpoint_url( 'lost-password', '', $wc_password_reset_url );
-	} else {
-		return $default_url;
-	}
-}
-add_filter( 'lostpassword_url',  'wc_lostpassword_url', 10, 1 );
-
-/**
- * Get the link to the edit account details page.
- *
- * @return string
- */
-function wc_customer_edit_account_url() {
-	$edit_account_url = wc_get_endpoint_url( 'edit-account', '', wc_get_page_permalink( 'myaccount' ) );
-
-	return apply_filters( 'woocommerce_customer_edit_account_url', $edit_account_url );
-}
-
 /**
  * Hide menu items conditionally.
  *