diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 4d1286ad..ef04e75d 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2235,7 +2235,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							if (isset( $this->set_mode ) && $this->set_mode == 'register') {
 								$imgValue = UM()->uploader()->get_core_temp_url() . "/" . $this->field_value( $key, $default, $data );
 							} else {
-								$imgValue = um_user_uploads_uri() . $this->field_value( $key, $default, $data );
+								$imgValue = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $this->field_value( $key, $default, $data );
 							}
 							$img = '<img src="' . $imgValue . '" alt="" />';
 						} else {
@@ -2310,8 +2310,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$file_url = UM()->uploader()->get_core_temp_url() . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
 							$file_dir = UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
 						} else {
-							$file_url = um_user_uploads_uri() . $this->field_value( $key, $default, $data );
-							$file_dir = um_user_uploads_dir() . $this->field_value( $key, $default, $data );
+							$file_url = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $this->field_value( $key, $default, $data );
+							$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
 						}
 
 						if ( file_exists( $file_dir ) ) {
diff --git a/includes/core/class-uploader.php b/includes/core/class-uploader.php
index 198cd9c1..4d1e243d 100644
--- a/includes/core/class-uploader.php
+++ b/includes/core/class-uploader.php
@@ -1169,9 +1169,9 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
 			}
 			$_array = array_merge( $_array, $new_files );
 
-			$files = glob( um_user_uploads_dir() . '*', GLOB_BRACE );
+			$files = glob( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . '*', GLOB_BRACE );
 			$error = array();
-			if ( file_exists( um_user_uploads_dir() ) && $files && isset( $_array ) && is_array( $_array ) ) {
+			if ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR ) && $files && isset( $_array ) && is_array( $_array ) ) {
 				foreach ( $files as $file ) {
 					$str = basename( $file );
 
diff --git a/includes/core/class-user.php b/includes/core/class-user.php
index 57eb66a4..f7f0e933 100644
--- a/includes/core/class-user.php
+++ b/includes/core/class-user.php
@@ -152,7 +152,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			}
 
 			// remove uploads
-			UM()->files()->remove_dir( um_user_uploads_dir() );
+			UM()->files()->remove_dir( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR );
 		}
 
 
diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php
index bbca9331..ba9ab4a3 100644
--- a/includes/core/um-filters-fields.php
+++ b/includes/core/um-filters-fields.php
@@ -223,10 +223,10 @@ add_filter( 'um_profile_field_filter_hook__date', 'um_profile_field_filter_hook_
  * @return string
  */
 function um_profile_field_filter_hook__file( $value, $data ) {
-	$uri = um_user_uploads_uri() . $value;
+	$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $value;
 	$file_type = wp_check_filetype( $value );
     
-	if ( ! file_exists( um_user_uploads_dir() . $value ) ) {
+	if ( ! file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value ) ) {
 		$value = __('This file has been removed.','ultimate-member');
 	} else {
 		$file_info = um_user( $data['metakey']."_metadata" );
@@ -257,14 +257,14 @@ add_filter( 'um_profile_field_filter_hook__file', 'um_profile_field_filter_hook_
  * @return string
  */
 function um_profile_field_filter_hook__image( $value, $data ) {
-	$uri = um_user_uploads_uri() . $value;
+	$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $value;
 	$title = ( isset( $data['title'] ) ) ? $data['title'] : __('Untitled photo');
 
 	// if value is an image tag
 	if( preg_match( '/\<img.*src=\"([^"]+).*/', $value, $matches ) ) {
 		$uri   = $matches[1];
 		$value = '<div class="um-photo"><a href="#" class="um-photo-modal" data-src="'.$uri.'"><img src="'. $uri .'" alt="'.$title.'" title="'.$title.'" class="" /></a></div>';
-	} else if ( file_exists( um_user_uploads_dir() . $value ) ) {
+	} else if ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value ) ) {
 		$value = '<div class="um-photo"><a href="#" class="um-photo-modal" data-src="'.$uri.'"><img src="'. $uri .'" alt="'.$title.'" title="'.$title.'" class="" /></a></div>';
 	} else {
 		$value = '';
diff --git a/includes/um-deprecated-functions.php b/includes/um-deprecated-functions.php
index a1050057..db6fc163 100644
--- a/includes/um-deprecated-functions.php
+++ b/includes/um-deprecated-functions.php
@@ -335,4 +335,32 @@ function um_core_is_local() {
 function um_get_url_for_language( $post_id, $language ) {
 	//um_deprecated_function( 'um_get_url_for_language', '2.0', 'UM()->external_integrations()->get_url_for_language' );
 	return UM()->external_integrations()->get_url_for_language( $post_id, $language );
+}
+
+
+/**
+ * user uploads directory
+ *
+ * @deprecated 2.0.26
+ *
+ * @return string
+ */
+function um_user_uploads_dir() {
+	//um_deprecated_function( 'um_user_uploads_dir', '2.0.26', 'UM()->external_integrations()->get_url_for_language' );
+	$uri = UM()->files()->upload_basedir . um_user( 'ID' ) . '/';
+	return $uri;
+}
+
+/**
+ * user uploads uri
+ *
+ * @deprecated 2.0.26
+ *
+ * @return string
+ */
+function um_user_uploads_uri() {
+	//um_deprecated_function( 'um_user_uploads_uri', '2.0.26', 'UM()->external_integrations()->get_url_for_language' );
+	UM()->files()->upload_baseurl = set_url_scheme( UM()->files()->upload_baseurl );
+	$uri = UM()->files()->upload_baseurl . um_user( 'ID' ) . '/';
+	return $uri;
 }
\ No newline at end of file
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index 384f6c2e..fa803945 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -555,7 +555,7 @@ function um_user_submitted_registration( $style = false ) {
 
 			if ( UM()->fields()->get_field_type( $k ) == 'image' || UM()->fields()->get_field_type( $k ) == 'file' ) {
 				$file = basename( $v );
-				$v = um_user_uploads_uri() . $file;
+				$v = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $file;
 			}
 
 			if ( is_array( $v ) ) {
@@ -1655,32 +1655,6 @@ function um_youtube_id_from_url( $url ) {
 }
 
 
-/**
- * user uploads uri
- *
- * @return string
- */
-function um_user_uploads_uri() {
-    UM()->files()->upload_baseurl = set_url_scheme( UM()->files()->upload_baseurl );
-
-	$uri = UM()->files()->upload_baseurl . um_user( 'ID' ) . '/';
-
-	return $uri;
-}
-
-
-/**
- * user uploads directory
- *
- * @return string
- */
-function um_user_uploads_dir() {
-	$uri = UM()->files()->upload_basedir . um_user( 'ID' ) . '/';
-
-	return $uri;
-}
-
-
 /**
  * Find closest number in an array
  *